diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 19:05:02 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-02 14:58:56 +0100 |
| commit | a6e69f8fcd017519c37be409097108da6a6fcb33 (patch) | |
| tree | 5906fed0faf294ccc3cc54a77a878e7b91a16f31 /sc/source/ui | |
| parent | 775a632985975057f5fa6c196aaffcd0a05e617a (diff) | |
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'sc/source/ui')
97 files changed, 326 insertions, 322 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 54e2b0e45834..d3233a2bea05 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -182,7 +182,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleContextBase::getAccessibleAtP const awt::Point& /* rPoint */ ) throw (uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); return uno::Reference<XAccessible>(); } @@ -246,7 +246,7 @@ sal_Bool SAL_CALL ScAccessibleContextBase::isVisible( ) void SAL_CALL ScAccessibleContextBase::grabFocus( ) throw (uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } sal_Int32 SAL_CALL ScAccessibleContextBase::getForeground( ) @@ -267,7 +267,7 @@ sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount(void) throw (uno::RuntimeException) { - DBG_ERROR("should be implemented in the abrevated class"); + OSL_FAIL("should be implemented in the abrevated class"); return 0; } @@ -275,7 +275,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleContextBase::getAccessibleChild(sal_Int32 /* nIndex */) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - DBG_ERROR("should be implemented in the abrevated class"); + OSL_FAIL("should be implemented in the abrevated class"); return uno::Reference<XAccessible>(); } @@ -544,7 +544,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleContextBase::createAccessibleDescription(void) throw (uno::RuntimeException) { - DBG_ERROR("should be implemented in the abrevated class"); + OSL_FAIL("should be implemented in the abrevated class"); return rtl::OUString(); } @@ -552,7 +552,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessibleContextBase::createAccessibleName(void) throw (uno::RuntimeException) { - DBG_ERROR("should be implemented in the abrevated class"); + OSL_FAIL("should be implemented in the abrevated class"); return rtl::OUString(); } @@ -604,14 +604,14 @@ void ScAccessibleContextBase::CommitFocusLost() const Rectangle ScAccessibleContextBase::GetBoundingBoxOnScreen(void) const throw (uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); return Rectangle(); } Rectangle ScAccessibleContextBase::GetBoundingBox(void) const throw (uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); return Rectangle(); } diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index fb78e551432c..7402311b93c1 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -332,7 +332,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint } else { - DBG_ERROR("is it a deletion or a insertion?"); + OSL_FAIL("is it a deletion or a insertion?"); } CommitTableModelChange(rRef.GetRange().aStart.Row(), @@ -779,14 +779,14 @@ void ScAccessibleSpreadsheet::CreateSortedMarkedCells() } else { - DBG_ERROR("Range of wrong table"); + OSL_FAIL("Range of wrong table"); } } else if(pRange->aStart.Tab() == maActiveCell.Tab()) AddMarkedRange(*pRange); else { - DBG_ERROR("Range of wrong table"); + OSL_FAIL("Range of wrong table"); } } std::sort(mpSortedMarkedCells->begin(), mpSortedMarkedCells->end()); diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 8118043a6415..a4a595972238 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -115,7 +115,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) ::rtl::OUString SAL_CALL ScAccessibleTableBase::getAccessibleRowDescription( sal_Int32 nRow ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { - DBG_ERROR("Here should be a implementation to fill the description"); + OSL_FAIL("Here should be a implementation to fill the description"); if ((nRow > (maRange.aEnd.Row() - maRange.aStart.Row())) || (nRow < 0)) throw lang::IndexOutOfBoundsException(); @@ -127,7 +127,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumnCount( ) ::rtl::OUString SAL_CALL ScAccessibleTableBase::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { - DBG_ERROR("Here should be a implementation to fill the description"); + OSL_FAIL("Here should be a implementation to fill the description"); if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0)) throw lang::IndexOutOfBoundsException(); @@ -198,7 +198,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible throw (uno::RuntimeException) { uno::Reference< XAccessibleTable > xAccessibleTable; - DBG_ERROR("Here should be a implementation to fill the row headers"); + OSL_FAIL("Here should be a implementation to fill the row headers"); //CommitChange return xAccessibleTable; @@ -208,7 +208,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible throw (uno::RuntimeException) { uno::Reference< XAccessibleTable > xAccessibleTable; - DBG_ERROR("Here should be a implementation to fill the column headers"); + OSL_FAIL("Here should be a implementation to fill the column headers"); //CommitChange return xAccessibleTable; @@ -217,7 +217,7 @@ uno::Reference< XAccessibleTable > SAL_CALL ScAccessibleTableBase::getAccessible uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleRows( ) throw (uno::RuntimeException) { - DBG_ERROR("not implemented yet"); + OSL_FAIL("not implemented yet"); uno::Sequence< sal_Int32 > aSequence; return aSequence; } @@ -225,7 +225,7 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessible uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessibleColumns( ) throw (uno::RuntimeException) { - DBG_ERROR("not implemented yet"); + OSL_FAIL("not implemented yet"); uno::Sequence< sal_Int32 > aSequence; return aSequence; } @@ -233,21 +233,21 @@ uno::Sequence< sal_Int32 > SAL_CALL ScAccessibleTableBase::getSelectedAccessible sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleRowSelected( sal_Int32 /* nRow */ ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { - DBG_ERROR("not implemented yet"); + OSL_FAIL("not implemented yet"); return sal_False; } sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleColumnSelected( sal_Int32 /* nColumn */ ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { - DBG_ERROR("not implemented yet"); + OSL_FAIL("not implemented yet"); return sal_False; } uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCellAt( sal_Int32 /* nRow */, sal_Int32 /* nColumn */ ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { - DBG_ERROR("not implemented yet"); + OSL_FAIL("not implemented yet"); uno::Reference< XAccessible > xAccessible; return xAccessible; } @@ -255,7 +255,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCellA uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCaption( ) throw (uno::RuntimeException) { - DBG_ERROR("not implemented yet"); + OSL_FAIL("not implemented yet"); uno::Reference< XAccessible > xAccessible; return xAccessible; } @@ -263,7 +263,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleCapti uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleSummary( ) throw (uno::RuntimeException) { - DBG_ERROR("not implemented yet"); + OSL_FAIL("not implemented yet"); uno::Reference< XAccessible > xAccessible; return xAccessible; } @@ -271,7 +271,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleTableBase::getAccessibleSumma sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow */, sal_Int32 /* nColumn */ ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { - DBG_ERROR("not implemented yet"); + OSL_FAIL("not implemented yet"); return sal_False; } @@ -373,7 +373,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleTableBase::getAccessibleRelationSet(void) throw (uno::RuntimeException) { - DBG_ERROR("should be implemented in the abrevated class"); + OSL_FAIL("should be implemented in the abrevated class"); return uno::Reference<XAccessibleRelationSet>(); } @@ -381,7 +381,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleTableBase::getAccessibleStateSet(void) throw (uno::RuntimeException) { - DBG_ERROR("should be implemented in the abrevated class"); + OSL_FAIL("should be implemented in the abrevated class"); uno::Reference< XAccessibleStateSet > xAccessibleStateSet; return xAccessibleStateSet; } diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 307bee7d4896..4abf771296f2 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -115,7 +115,7 @@ Rectangle ScViewForwarder::GetVisArea() const } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return aVisArea; } @@ -130,7 +130,7 @@ Point ScViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMod } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return Point(); } @@ -145,7 +145,7 @@ Point ScViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMapMod } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return Point(); } @@ -205,7 +205,7 @@ Rectangle ScEditObjectViewForwarder::GetVisArea() const } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return aVisArea; } @@ -226,7 +226,7 @@ Point ScEditObjectViewForwarder::LogicToPixel( const Point& rPoint, const MapMod } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return Point(); } @@ -247,7 +247,7 @@ Point ScEditObjectViewForwarder::PixelToLogic( const Point& rPoint, const MapMod } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return Point(); } @@ -299,7 +299,7 @@ BOOL ScPreviewViewForwarder::IsValid() const Rectangle ScPreviewViewForwarder::GetVisArea() const { Rectangle aVisArea; - DBG_ERROR("should be implemented in an abrevated class"); + OSL_FAIL("should be implemented in an abrevated class"); return aVisArea; } @@ -317,7 +317,7 @@ Point ScPreviewViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return Point(); } @@ -340,7 +340,7 @@ Point ScPreviewViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return Point(); } @@ -426,7 +426,7 @@ Rectangle ScPreviewHeaderFooterViewForwarder::GetVisArea() const } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return aVisArea; } @@ -466,7 +466,7 @@ Rectangle ScPreviewCellViewForwarder::GetVisArea() const } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return aVisArea; } @@ -512,7 +512,7 @@ Rectangle ScPreviewHeaderCellViewForwarder::GetVisArea() const } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return aVisArea; } @@ -556,7 +556,7 @@ Rectangle ScPreviewNoteViewForwarder::GetVisArea() const } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return aVisArea; } @@ -616,7 +616,7 @@ Rectangle ScEditViewForwarder::GetVisArea() const } else { - DBG_ERROR("this EditViewForwarder is no longer valid"); + OSL_FAIL("this EditViewForwarder is no longer valid"); } return aVisArea; } @@ -627,7 +627,7 @@ Point ScEditViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMa return mpWindow->LogicToPixel( rPoint, rMapMode ); else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return Point(); } @@ -638,7 +638,7 @@ Point ScEditViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMa return mpWindow->PixelToLogic( rPoint, rMapMode ); else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return Point(); } @@ -653,7 +653,7 @@ sal_Bool ScEditViewForwarder::GetSelection( ESelection& rSelection ) const } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return bResult; } @@ -668,7 +668,7 @@ sal_Bool ScEditViewForwarder::SetSelection( const ESelection& rSelection ) } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return bResult; } @@ -683,7 +683,7 @@ sal_Bool ScEditViewForwarder::Copy() } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return bResult; } @@ -698,7 +698,7 @@ sal_Bool ScEditViewForwarder::Cut() } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return bResult; } @@ -713,7 +713,7 @@ sal_Bool ScEditViewForwarder::Paste() } else { - DBG_ERROR("this ViewForwarder is not valid"); + OSL_FAIL("this ViewForwarder is not valid"); } return bResult; } diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index f1869f54669d..34102618a9bd 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -99,7 +99,7 @@ void ScClient::RequestNewObjectArea( Rectangle& aLogicRect ) ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh ); if (!pViewSh) { - DBG_ERROR("Wrong ViewShell"); + OSL_FAIL("Wrong ViewShell"); return; } @@ -161,7 +161,7 @@ void ScClient::ObjectAreaChanged() ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh ); if (!pViewSh) { - DBG_ERROR("Wrong ViewShell"); + OSL_FAIL("Wrong ViewShell"); return; } @@ -202,7 +202,7 @@ void ScClient::ViewChanged() aSz = xObj->getVisualAreaSize( GetAspect() ); } catch ( embed::NoVisualAreaSizeException& ) { - DBG_ERROR("The visual area size must be available!\n"); + OSL_FAIL("The visual area size must be available!\n"); } MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( GetAspect() ) ); diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 327f8b4cb58e..0ad71d1c8236 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -249,12 +249,12 @@ ScDrawTransferObj::~ScDrawTransferObj() ScModule* pScMod = SC_MOD(); if ( pScMod->GetClipData().pDrawClipboard == this ) { - DBG_ERROR("ScDrawTransferObj wasn't released"); + OSL_FAIL("ScDrawTransferObj wasn't released"); pScMod->SetClipObject( NULL, NULL ); } if ( pScMod->GetDragData().pDrawTransfer == this ) { - DBG_ERROR("ScDrawTransferObj wasn't released"); + OSL_FAIL("ScDrawTransferObj wasn't released"); pScMod->ResetDragObject(); } @@ -613,7 +613,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse break; default: - DBG_ERROR("unknown object id"); + OSL_FAIL("unknown object id"); } return bRet; } diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 47be9762b70f..060afa19040e 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -290,7 +290,7 @@ void ScInputHandler::UpdateRange( USHORT nIndex, const ScRange& rNew ) } else { - DBG_ERROR("UpdateRange: da fehlt was"); + OSL_FAIL("UpdateRange: da fehlt was"); } } @@ -1679,7 +1679,7 @@ void ScInputHandler::ViewShellGone(ScTabViewShell* pViewSh) // wird synchron if ( pActiveViewSh && pActiveViewSh == pViewSh ) { - DBG_ERROR("pActiveViewSh weg"); + OSL_FAIL("pActiveViewSh weg"); pActiveViewSh = NULL; } @@ -2220,7 +2220,7 @@ void ScInputHandler::ShowRefFrame() } else { - DBG_ERROR("ViewFrame fuer Referenzeingabe ist nicht mehr da"); + OSL_FAIL("ViewFrame fuer Referenzeingabe ist nicht mehr da"); } } } @@ -2891,7 +2891,7 @@ void ScInputHandler::InsertFunction( const String& rFuncName, BOOL bAddPar ) { if ( eMode == SC_INPUT_NONE ) { - DBG_ERROR("InsertFunction, nicht im Eingabemodus"); + OSL_FAIL("InsertFunction, nicht im Eingabemodus"); return; } @@ -2938,7 +2938,7 @@ void ScInputHandler::ClearText() { if ( eMode == SC_INPUT_NONE ) { - DBG_ERROR("ClearText, nicht im Eingabemodus"); + OSL_FAIL("ClearText, nicht im Eingabemodus"); return; } diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 13ea95340aac..ba9634af5464 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -639,7 +639,7 @@ void ScModule::Execute( SfxRequest& rReq ) break; default: - DBG_ERROR( "ScApplication: Unknown Message." ); + OSL_FAIL( "ScApplication: Unknown Message." ); break; } } @@ -1807,7 +1807,7 @@ void ScModule::SetReference( const ScRange& rRef, ScDocument* pDoc, pHdl->SetReference( aNew, pDoc ); else { - DBG_ERROR("SetReference ohne Empfaenger"); + OSL_FAIL("SetReference ohne Empfaenger"); } } } @@ -2182,7 +2182,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo ) } else { - DBG_ERROR("unbekannter Feldbefehl"); + OSL_FAIL("unbekannter Feldbefehl"); pInfo->SetRepresentation(String('?')); } } diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 6cf559d950fd..f5441715f270 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -96,7 +96,7 @@ BOOL ScModule::HasThesaurusLanguage( USHORT nLang ) } catch( uno::Exception& ) { - DBG_ERROR("Error in Thesaurus"); + OSL_FAIL("Error in Thesaurus"); } return bHasLang; diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 8321263c7b51..ad855bfbbc59 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -197,12 +197,12 @@ ScTransferObj::~ScTransferObj() ScModule* pScMod = SC_MOD(); if ( pScMod->GetClipData().pCellClipboard == this ) { - DBG_ERROR("ScTransferObj wasn't released"); + OSL_FAIL("ScTransferObj wasn't released"); pScMod->SetClipObject( NULL, NULL ); } if ( pScMod->GetDragData().pCellTransfer == this ) { - DBG_ERROR("ScTransferObj wasn't released"); + OSL_FAIL("ScTransferObj wasn't released"); pScMod->ResetDragObject(); } @@ -228,7 +228,7 @@ ScTransferObj* ScTransferObj::GetOwnClipboard( Window* pUIWin ) TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pUIWin ) ); if ( !aDataHelper.HasFormat( SOT_FORMATSTR_ID_DIF ) ) { -// DBG_ERROR("ScTransferObj wasn't released"); +// OSL_FAIL("ScTransferObj wasn't released"); pObj = NULL; } } @@ -335,7 +335,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) } else { - DBG_ERROR("unknown DataType"); + OSL_FAIL("unknown DataType"); } } else if ( nFormat == SOT_FORMAT_BITMAP ) @@ -474,7 +474,7 @@ sal_Bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObj break; default: - DBG_ERROR("unknown object id"); + OSL_FAIL("unknown object id"); } return bRet; } @@ -768,7 +768,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc, if (!pDoc->HasTable(nSrcTab) || !pDestDoc->HasTable(nDestTab)) { - DBG_ERROR("Sheet not found in ScTransferObj::StripRefs"); + OSL_FAIL("Sheet not found in ScTransferObj::StripRefs"); return; } diff --git a/sc/source/ui/app/wtcdummy.cxx b/sc/source/ui/app/wtcdummy.cxx index 055a37a644f4..afa788dc7714 100644 --- a/sc/source/ui/app/wtcdummy.cxx +++ b/sc/source/ui/app/wtcdummy.cxx @@ -40,12 +40,12 @@ class SdbColumns SdbColumns::SdbColumns() { - DBG_ERROR("WATCOM Hack failed !"); + OSL_FAIL("WATCOM Hack failed !"); } SdbColumns::~SdbColumns() { - DBG_ERROR("WATCOM Hack failed !"); + OSL_FAIL("WATCOM Hack failed !"); } class SdbRow @@ -57,12 +57,12 @@ class SdbRow SdbRow::SdbRow() { - DBG_ERROR("WATCOM Hack failed !"); + OSL_FAIL("WATCOM Hack failed !"); } SdbRow::~SdbRow() { - DBG_ERROR("WATCOM Hack failed !"); + OSL_FAIL("WATCOM Hack failed !"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 5355b62cbed3..2b7b56b116a9 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -107,7 +107,7 @@ ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : } catch(uno::Exception&) { - DBG_ERROR("exception in database"); + OSL_FAIL("exception in database"); } aLbDatabase.SelectEntryPos( 0 ); diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 7383513a06bf..82a8e8801b8b 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -541,13 +541,13 @@ void ScFilterDlg::UpdateHdrInValueList( USHORT nList ) } else { - DBG_ERROR("Eintag in Liste nicht gefunden"); + OSL_FAIL("Eintag in Liste nicht gefunden"); } } } else { - DBG_ERROR("Spalte noch nicht initialisiert"); + OSL_FAIL("Spalte noch nicht initialisiert"); } } } diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 4967f0e4c907..d237e807242b 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -992,7 +992,7 @@ void ScDPLayoutDlg::NotifyDoubleClick( ScDPFieldType eType, size_t nFieldIndex ) { if ( nFieldIndex >= pArr->size() ) { - DBG_ERROR("invalid selection"); + OSL_FAIL("invalid selection"); return; } diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 0a865dcdd1ba..abc491618d2e 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -355,7 +355,7 @@ ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( USHORT nPos ) case 9: return SUBTOTAL_FUNC_VAR; case 10: return SUBTOTAL_FUNC_VARP; default: - DBG_ERROR( "ScTpSubTotalGroup::LbPosToFunc" ); + OSL_FAIL( "ScTpSubTotalGroup::LbPosToFunc" ); return SUBTOTAL_FUNC_NONE; } } @@ -379,7 +379,7 @@ USHORT ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) case SUBTOTAL_FUNC_VAR: return 9; case SUBTOTAL_FUNC_VARP: return 10; default: - DBG_ERROR( "ScTpSubTotalGroup::FuncToLbPos" ); + OSL_FAIL( "ScTpSubTotalGroup::FuncToLbPos" ); return 0; } } diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index be26ca3a0ad7..0dec37d1e581 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -427,7 +427,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, rSortParam.nCol2, rSortParam.nRow2 ); if (!pDBData) { - DBG_ERROR( "Sort: keine DBData" ); + OSL_FAIL( "Sort: keine DBData" ); return FALSE; } @@ -606,7 +606,7 @@ BOOL ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, } else { - DBG_ERROR("Zielbereich nicht da"); + OSL_FAIL("Zielbereich nicht da"); } } @@ -663,7 +663,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, rQueryParam.nCol2, rQueryParam.nRow2 ); if (!pDBData) { - DBG_ERROR( "Query: keine DBData" ); + OSL_FAIL( "Query: keine DBData" ); return FALSE; } @@ -935,7 +935,7 @@ BOOL ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, } else { - DBG_ERROR("Zielbereich nicht da"); + OSL_FAIL("Zielbereich nicht da"); } } @@ -1002,7 +1002,7 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, rParam.nCol2, rParam.nRow2 ); if (!pDBData) { - DBG_ERROR( "SubTotals: keine DBData" ); + OSL_FAIL( "SubTotals: keine DBData" ); return FALSE; } @@ -1289,7 +1289,7 @@ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb pDestObj->SetAlive(TRUE); if ( !pDoc->GetDPCollection()->InsertNewTable(pDestObj) ) { - DBG_ERROR("cannot insert DPObject"); + OSL_FAIL("cannot insert DPObject"); DELETEZ( pDestObj ); } } diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index b074d8c42d33..92c411ea5638 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -112,7 +112,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram } else { - DBG_ERROR("no selection supplier in the beamer!"); + OSL_FAIL("no selection supplier in the beamer!"); } } } @@ -230,7 +230,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, rParam.nCol2, rParam.nRow2 ); if (!pDBData) { - DBG_ERROR( "DoImport: no DBData" ); + OSL_FAIL( "DoImport: no DBData" ); return FALSE; } } @@ -457,7 +457,7 @@ BOOL ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } catch ( uno::Exception& ) { - DBG_ERROR("Unexpected exception in database"); + OSL_FAIL("Unexpected exception in database"); } pImportDoc->DoColResize( nTab, rParam.nCol1,nEndCol, 0 ); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 4a55079bfb03..ca2fa5171ea1 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -518,7 +518,7 @@ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic ) aFunc.ShowError( nCol, nRow ); break; default: - DBG_ERROR("falsche Op bei DetectiveRefresh"); + OSL_FAIL("falsche Op bei DetectiveRefresh"); } } } @@ -589,7 +589,7 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags, if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) { - DBG_ERROR("ScDocFunc::DeleteContents ohne Markierung"); + OSL_FAIL("ScDocFunc::DeleteContents ohne Markierung"); return FALSE; } @@ -1359,7 +1359,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, if ( !ValidRow(nStartRow) || !ValidRow(nEndRow) ) { - DBG_ERROR("invalid row in InsertCells"); + OSL_FAIL("invalid row in InsertCells"); return FALSE; } @@ -1638,7 +1638,7 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, nPaintFlags |= PAINT_TOP; break; default: - DBG_ERROR("Falscher Code beim Einfuegen"); + OSL_FAIL("Falscher Code beim Einfuegen"); bSuccess = FALSE; break; } @@ -1794,7 +1794,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, if ( !ValidRow(nStartRow) || !ValidRow(nEndRow) ) { - DBG_ERROR("invalid row in DeleteCells"); + OSL_FAIL("invalid row in DeleteCells"); return FALSE; } @@ -2100,7 +2100,7 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, nPaintFlags |= PAINT_TOP; break; default: - DBG_ERROR("Falscher Code beim Loeschen"); + OSL_FAIL("Falscher Code beim Loeschen"); break; } @@ -2280,7 +2280,7 @@ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, if ( !ValidRow(nStartRow) || !ValidRow(nEndRow) || !ValidRow(nDestRow) ) { - DBG_ERROR("invalid row in MoveBlock"); + OSL_FAIL("invalid row in MoveBlock"); return FALSE; } @@ -4195,7 +4195,7 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e case FILL_TO_TOP: if (nCount > sal::static_int_cast<ULONG>( aSourceArea.aStart.Row() )) { - DBG_ERROR("FillAuto: Row < 0"); + OSL_FAIL("FillAuto: Row < 0"); nCount = aSourceArea.aStart.Row(); } aDestArea.aStart.SetRow( sal::static_int_cast<SCROW>( aSourceArea.aStart.Row() - nCount ) ); @@ -4206,13 +4206,13 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e case FILL_TO_LEFT: if (nCount > sal::static_int_cast<ULONG>( aSourceArea.aStart.Col() )) { - DBG_ERROR("FillAuto: Col < 0"); + OSL_FAIL("FillAuto: Col < 0"); nCount = aSourceArea.aStart.Col(); } aDestArea.aStart.SetCol( sal::static_int_cast<SCCOL>( aSourceArea.aStart.Col() - nCount ) ); break; default: - DBG_ERROR("Falsche Richtung bei FillAuto"); + OSL_FAIL("Falsche Richtung bei FillAuto"); break; } @@ -4584,7 +4584,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList, ScAddress( nPosX, nPosY, nTab)); if (!rList.Insert(pData)) { - DBG_ERROR("nanu?"); + OSL_FAIL("nanu?"); delete pData; } } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 8459d37150a5..221b5d8a439c 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -224,7 +224,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, } else { - DBG_ERROR("wat fuer ne Version?"); + OSL_FAIL("wat fuer ne Version?"); } } @@ -400,7 +400,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet) } else { - DBG_ERROR("The Modificator should exist"); + OSL_FAIL("The Modificator should exist"); } aDocument.DisableIdle( FALSE ); @@ -902,7 +902,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } catch ( uno::Exception& ) { - DBG_ERROR( "SFX_EVENT_SAVEDOC: caught exception\n" ); + OSL_FAIL( "SFX_EVENT_SAVEDOC: caught exception\n" ); SC_MOD()->SetInSharedDocSaving( false ); try @@ -1200,7 +1200,7 @@ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium ) } else { - DBG_ERROR( "No Stream" ); + OSL_FAIL( "No Stream" ); } } @@ -1312,7 +1312,7 @@ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium ) } else { - DBG_ERROR( "No Stream" ); + OSL_FAIL( "No Stream" ); } } @@ -1370,7 +1370,7 @@ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium ) } else { - DBG_ERROR( "No Stream" ); + OSL_FAIL( "No Stream" ); } } @@ -1419,7 +1419,7 @@ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium ) } else { - DBG_ERROR( "No Stream" ); + OSL_FAIL( "No Stream" ); } } @@ -1437,7 +1437,7 @@ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium ) } else { - DBG_ERROR("Kein Filter bei ConvertFrom"); + OSL_FAIL("Kein Filter bei ConvertFrom"); } InitItems(); @@ -1887,7 +1887,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt } break; default: - DBG_ERROR( "ScDocShell::AsciiSave: unknown CellType" ); + OSL_FAIL( "ScDocShell::AsciiSave: unknown CellType" ); aString.Erase(); bString = FALSE; } @@ -2055,7 +2055,7 @@ BOOL ScDocShell::ConvertTo( SfxMedium &rMed ) if (aFltName.EqualsAscii(pFilterXML)) { //TODO/LATER: this shouldn't happen! - DBG_ERROR("XML filter in ConvertFrom?!"); + OSL_FAIL("XML filter in ConvertFrom?!"); bRet = SaveXML( &rMed, NULL ); } else if (aFltName.EqualsAscii(pFilterExcel5) || aFltName.EqualsAscii(pFilterExcel95) || @@ -2576,7 +2576,7 @@ ScDocShell::~ScDocShell() if (pModificator) { - DBG_ERROR("The Modificator should not exist"); + OSL_FAIL("The Modificator should not exist"); delete pModificator; } } diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 10081240b864..a9e79b46e86f 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -274,7 +274,7 @@ void ScDocShell::UnlockPaint_Impl(BOOL bDoc) } else { - DBG_ERROR("UnlockPaint ohne LockPaint"); + OSL_FAIL("UnlockPaint ohne LockPaint"); } } @@ -347,7 +347,7 @@ void ScDocShell::UnlockDocument() } else { - DBG_ERROR("UnlockDocument without LockDocument"); + OSL_FAIL("UnlockDocument without LockDocument"); } } @@ -407,7 +407,7 @@ void ScDocShell::CalcOutputFactor() nPrtToScreenFactor = nPrinterWidth / (double) nWindowWidth; else { - DBG_ERROR("GetTextSize gibt 0 ??"); + OSL_FAIL("GetTextSize gibt 0 ??"); nPrtToScreenFactor = 1.0; } } @@ -800,7 +800,7 @@ bool lcl_FindAction( ScDocument* pDoc, const ScChangeAction* pAction, ScDocument pA->GetDescription( aADesc, pSearchDoc, TRUE ); if ( aActionDesc.Equals( aADesc ) ) { - DBG_ERROR( "lcl_FindAction(): found equal action!" ); + OSL_FAIL( "lcl_FindAction(): found equal action!" ); return true; } } @@ -1064,7 +1064,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck pViewSh->EnterData( aPos.Col(), aPos.Row(), aPos.Tab(), aValue ); break; default: - DBG_ERROR( "MergeDocument: unknown MatrixFlag" ); + OSL_FAIL( "MergeDocument: unknown MatrixFlag" ); } } break; @@ -1136,7 +1136,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck pAct->SetComment( rComment ); #ifdef DBG_UTIL else - DBG_ERROR( "MergeDocument: wohin mit dem Kommentar?!?" ); + OSL_FAIL( "MergeDocument: wohin mit dem Kommentar?!?" ); #endif } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 93aa6734fc6c..8ea77526cf66 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -297,7 +297,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) } else { - DBG_ERROR( "arguments expected" ); + OSL_FAIL( "arguments expected" ); } } break; @@ -433,13 +433,13 @@ void ScDocShell::Execute( SfxRequest& rReq ) } else { - DBG_ERROR("UpdateChartArea: keine ViewShell oder falsche Daten"); + OSL_FAIL("UpdateChartArea: keine ViewShell oder falsche Daten"); } rReq.Done(); } else { - DBG_ERROR("SID_CHART_SOURCE ohne Argumente"); + OSL_FAIL("SID_CHART_SOURCE ohne Argumente"); } break; @@ -591,7 +591,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) case SID_AUTO_STYLE: - DBG_ERROR("use ScAutoStyleHint instead of SID_AUTO_STYLE"); + OSL_FAIL("use ScAutoStyleHint instead of SID_AUTO_STYLE"); break; case SID_GET_COLORTABLE: @@ -1110,7 +1110,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) } catch ( uno::Exception& ) { - DBG_ERROR( "SID_SHARE_DOC: caught exception\n" ); + OSL_FAIL( "SID_SHARE_DOC: caught exception\n" ); SC_MOD()->SetInSharedDocSaving( false ); try @@ -2672,7 +2672,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() } catch ( uno::Exception& ) { - DBG_ERROR( "ScDocShell::LoadSharedDocument(): caught exception\n" ); + OSL_FAIL( "ScDocShell::LoadSharedDocument(): caught exception\n" ); SC_MOD()->SetInSharedDocLoading( false ); try { diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 3c95fda6c2d5..4d09ec0c9438 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -761,7 +761,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const String& rName, BOOL bRecord ) } else { - DBG_ERROR( "UseScenario auf Szenario-Blatt" ); + OSL_FAIL( "UseScenario auf Szenario-Blatt" ); } } diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index e5af5a4e3fec..db1bcaf82251 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -322,7 +322,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet, long nRowCount = 0; if ( nRowCount < 0 ) { - DBG_ERROR("can't get row count"); + OSL_FAIL("can't get row count"); nRowCount = 0; } @@ -477,7 +477,7 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet, } catch ( uno::Exception& ) { - DBG_ERROR("Unexpected exception in database"); + OSL_FAIL("Unexpected exception in database"); nErr = ERRCODE_IO_GENERAL; } @@ -1037,7 +1037,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO break; default: - DBG_ERROR( "ScDocShell::DBaseExport: unknown FieldType" ); + OSL_FAIL( "ScDocShell::DBaseExport: unknown FieldType" ); if ( nErr == eERR_OK ) nErr = SCWARN_EXPORT_DATALOST; aDocument.GetValue( nDocCol, nDocRow, nTab, fVal ); @@ -1164,7 +1164,7 @@ ULONG ScDocShell::DBaseExport( const String& rFullFileName, CharSet eCharSet, BO } catch ( uno::Exception& ) { - DBG_ERROR("Unexpected exception in database"); + OSL_FAIL("Unexpected exception in database"); nErr = ERRCODE_IO_GENERAL; } diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 75c1961a1a99..4d1a9db81b46 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1304,7 +1304,7 @@ static FormulaToken* lcl_convertToToken(ScBaseCell* pCell) } } default: - DBG_ERROR("attempted to convert an unknown cell type."); + OSL_FAIL("attempted to convert an unknown cell type."); } return NULL; @@ -1408,7 +1408,7 @@ static ScTokenArray* lcl_convertToTokenArray(const ScDocument* pSrcDoc, ScRange& } break; default: - DBG_ERROR("attempted to convert an unknown cell type."); + OSL_FAIL("attempted to convert an unknown cell type."); } } } @@ -2456,7 +2456,7 @@ void ScExternalRefManager::addLinkListener(sal_uInt16 nFileId, LinkListener* pLi LinkListenerMap::value_type(nFileId, LinkListeners())); if (!r.second) { - DBG_ERROR("insertion of new link listener list failed"); + OSL_FAIL("insertion of new link listener list failed"); return; } diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index cd35f6068255..0ec8e582d093 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -113,7 +113,7 @@ ScServerObject::ScServerObject( ScDocShell* pShell, const String& rItem ) : } else { - DBG_ERROR("ScServerObject: invalid item"); + OSL_FAIL("ScServerObject: invalid item"); } } diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx index fe432103a912..49c8ed0652a6 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.cxx @@ -103,7 +103,7 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet) if ( pColorTable ) pDlg->SetColorTable( pColorTable ); else - { DBG_ERROR( "ColorList not found :-/" ); } + { OSL_FAIL( "ColorList not found :-/" ); } } } SfxItemSet aViewAttr(pDrView->GetModel()->GetItemPool()); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index b44528f81609..c471aad6f85e 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -252,7 +252,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) } break; default: - DBG_ERROR("falscher Slot"); + OSL_FAIL("falscher Slot"); } } @@ -376,7 +376,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) break; case SID_PASTE: - DBG_ERROR( "SdrView::PasteClipboard not supported anymore" ); + OSL_FAIL( "SdrView::PasteClipboard not supported anymore" ); break; case SID_SELECTALL: diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 056dea999853..fe38c247518b 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -286,7 +286,7 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) if ( pColorTable ) pDlg->SetColorTable( pColorTable ); else - { DBG_ERROR( "ColorList not found :-/" ); } + { OSL_FAIL( "ColorList not found :-/" ); } } } SfxItemSet aViewAttr(pDrView->GetModel()->GetItemPool()); diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index a6d63ce17bae..865d1eb5196b 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -216,7 +216,7 @@ SdrObject* FuConstArc::CreateDefaultObject(const sal_uInt16 nID, const Rectangle } else { - DBG_ERROR("Object is NO circle object"); + OSL_FAIL("Object is NO circle object"); } } diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index b57ddfd94ca7..822780dafd26 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -344,7 +344,7 @@ SdrObject* FuConstPolygon::CreateDefaultObject(const sal_uInt16 nID, const Recta } else { - DBG_ERROR("Object is NO path object"); + OSL_FAIL("Object is NO path object"); } pObj->SetLogicRect(rRectangle); diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index b671beeac3ac..e9f3e7031db4 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -253,7 +253,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rec } else { - DBG_ERROR("Object is NO line object"); + OSL_FAIL("Object is NO line object"); } break; @@ -287,7 +287,7 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rec } else { - DBG_ERROR("Object is NO caption object"); + OSL_FAIL("Object is NO caption object"); } break; diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 3df3e7b6b968..0efb433c071c 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -319,7 +319,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie } else { - DBG_ERROR("Invalid URL!"); + OSL_FAIL("Invalid URL!"); //! error message //! can this happen??? } @@ -654,7 +654,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* } else { - DBG_ERROR( "Could not create new table :-/" ); + OSL_FAIL( "Could not create new table :-/" ); } } else if ( nToTable != pData->GetTabNo() ) diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 9616d8a306d7..5d5f9befd329 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -803,7 +803,7 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR } else { - DBG_ERROR("Object is NO text object"); + OSL_FAIL("Object is NO text object"); } } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index f7857232bd27..8f1e46b46ee5 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -137,7 +137,7 @@ void ScConflictsListHelper::Transform_Impl( ScChangeActionList& rActionList, ScC else { aItr = rActionList.erase( aItr ); - DBG_ERROR( "ScConflictsListHelper::Transform_Impl: erased action from conflicts list!" ); + OSL_FAIL( "ScConflictsListHelper::Transform_Impl: erased action from conflicts list!" ); } } } diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 797f29612fe6..b96a1ad73594 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -186,7 +186,7 @@ void ScShareDocumentDlg::UpdateView() } catch ( uno::Exception& ) { - DBG_ERROR( "ScShareDocumentDlg::UpdateView(): caught exception\n" ); + OSL_FAIL( "ScShareDocumentDlg::UpdateView(): caught exception\n" ); maLbUsers.Clear(); maLbUsers.InsertEntry( maStrNoUserData, NULL ); } diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 6f927d34776f..428c39f038b5 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -198,7 +198,7 @@ void ScContentTree::InsertContent( USHORT nType, const String& rValue ) { if (nType >= SC_CONTENT_COUNT) { - DBG_ERROR("ScContentTree::InsertContent mit falschem Typ"); + OSL_FAIL("ScContentTree::InsertContent mit falschem Typ"); return; } @@ -207,7 +207,7 @@ void ScContentTree::InsertContent( USHORT nType, const String& rValue ) InsertEntry( rValue, pParent ); else { - DBG_ERROR("InsertContent ohne Parent"); + OSL_FAIL("InsertContent ohne Parent"); } } @@ -741,7 +741,7 @@ bool ScContentTree::IsPartOfType( USHORT nContentType, USHORT nObjIdentifier ) bRet = ( nObjIdentifier != OBJ_GRAF && nObjIdentifier != OBJ_OLE2 ); // everything else break; default: - DBG_ERROR("unknown content type"); + OSL_FAIL("unknown content type"); } return bRet; } @@ -847,7 +847,7 @@ const ScAreaLink* ScContentTree::GetLink( ULONG nIndex ) } } - DBG_ERROR("Link nicht gefunden"); + OSL_FAIL("Link nicht gefunden"); return NULL; } @@ -903,7 +903,7 @@ ScAddress ScContentTree::GetNotePos( ULONG nIndex ) } } - DBG_ERROR("Notiz nicht gefunden"); + OSL_FAIL("Notiz nicht gefunden"); return ScAddress(); } @@ -1428,7 +1428,7 @@ void ScContentTree::SelectDoc(const String& rName) // rName wie im Menue/Li } else { - DBG_ERROR("SelectDoc: nicht gefunden"); + OSL_FAIL("SelectDoc: nicht gefunden"); } } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 3922f85db03d..af0cb875409c 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -331,7 +331,7 @@ void ScTpUserLists::UpdateEntries( USHORT nList ) } else { - DBG_ERROR( "Invalid ListIndex :-/" ); + OSL_FAIL( "Invalid ListIndex :-/" ); } } @@ -395,7 +395,7 @@ void ScTpUserLists::AddNewList( const String& rEntriesStr ) if ( !pUserLists->Insert( new ScUserListData( theEntriesStr ) ) ) { - DBG_ERROR( "Entry could not be inserted :-/" ); + OSL_FAIL( "Entry could not be inserted :-/" ); } } diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 77542e3d6052..7e536683f4ff 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -212,7 +212,7 @@ IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG ) if ( !pViewSh ) { - DBG_ERROR( "Current ViewShell not found." ); + OSL_FAIL( "Current ViewShell not found." ); return 0; } diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index fa3dc6485ec7..9efefdf6a460 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -122,7 +122,7 @@ ScStyleDlg::ScStyleDlg( Window* pParent, break; default: - DBG_ERROR( "Family not supported" ); + OSL_FAIL( "Family not supported" ); } //-------------------------------------------------------------------- diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 84ea5d60050d..a670f067c8d8 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -1630,7 +1630,7 @@ void ScUndoSelectionStyle::DoChange( const BOOL bUndo ) (ScStyleSheet*) pStlPool->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); if (!pStyleSheet) { - DBG_ERROR("StyleSheet not found"); + OSL_FAIL("StyleSheet not found"); return; } pDoc->ApplySelectionStyle( *pStyleSheet, aMarkData ); @@ -1668,7 +1668,7 @@ void ScUndoSelectionStyle::Repeat(SfxRepeatTarget& rTarget) Find( aStyleName, SFX_STYLE_FAMILY_PARA ); if (!pStyleSheet) { - DBG_ERROR("StyleSheet not found"); + OSL_FAIL("StyleSheet not found"); return; } diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 863bb7081fba..905008c41da4 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -1484,7 +1484,7 @@ void ScUndoConversion::SetChangeTrack() nStartChangeAction, nEndChangeAction ); else { - DBG_ERROR( "ScUndoConversion::SetChangeTrack: kein UndoDoc" ); + OSL_FAIL( "ScUndoConversion::SetChangeTrack: kein UndoDoc" ); nStartChangeAction = nEndChangeAction = 0; } } @@ -1532,7 +1532,7 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo } else { - DBG_ERROR("Kein Un-/RedoDoc bei Un-/RedoSpelling"); + OSL_FAIL("Kein Un-/RedoDoc bei Un-/RedoSpelling"); } } @@ -1817,7 +1817,7 @@ ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDo return (ScAreaLink*)pBase; } - DBG_ERROR("ScAreaLink nicht gefunden"); + OSL_FAIL("ScAreaLink nicht gefunden"); return NULL; } diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 7d4147f19ca6..a57b0b137a9d 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -778,7 +778,7 @@ void ScUndoThesaurus::DoChange( BOOL bUndo, const String& rStr, } else { - DBG_ERROR("Nicht CELLTYPE_EDIT bei Un/RedoThesaurus"); + OSL_FAIL("Nicht CELLTYPE_EDIT bei Un/RedoThesaurus"); } } } @@ -1036,7 +1036,7 @@ void ScUndoDetective::Undo() pList->DeleteAndDestroy( nPos, 1 ); else { - DBG_ERROR("Detektiv-Eintrag in der Liste nicht gefunden"); + OSL_FAIL("Detektiv-Eintrag in der Liste nicht gefunden"); } } } diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 79b0e473f781..83d37fda9e62 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -1720,7 +1720,7 @@ void ScUndoDataPilot::Undo() pDestObj->SetAlive(TRUE); if ( !pDoc->GetDPCollection()->InsertNewTable(pDestObj) ) { - DBG_ERROR("cannot insert DPObject"); + OSL_FAIL("cannot insert DPObject"); DELETEZ( pDestObj ); } } @@ -1897,7 +1897,7 @@ void ScUndoConsolidate::Undo() } else { - DBG_ERROR("alte DB-Daten nicht gefunden"); + OSL_FAIL("alte DB-Daten nicht gefunden"); } } } diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index a5bf87c9a381..0af08d48593c 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -1053,7 +1053,7 @@ void ScUndoImportTab::Redo() { if (!pRedoDoc) { - DBG_ERROR("wo ist mein Redo-Document?"); + OSL_FAIL("wo ist mein Redo-Document?"); return; } @@ -1588,7 +1588,7 @@ SdrObject* ScUndoRenameObject::GetObject() } } } - DBG_ERROR("Object not found"); + OSL_FAIL("Object not found"); return NULL; } diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 8f98266d87d0..b391bee219a5 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -283,7 +283,7 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const rtl::OUString& aName, const else { delete pNew; - DBG_ERROR("AutoFormat konnte nicht eingefuegt werden"); + OSL_FAIL("AutoFormat konnte nicht eingefuegt werden"); throw uno::RuntimeException(); } } @@ -600,7 +600,7 @@ void SAL_CALL ScAutoFormatObj::setName( const rtl::OUString& aNewName ) else { delete pNew; - DBG_ERROR("AutoFormat konnte nicht eingefuegt werden"); + OSL_FAIL("AutoFormat konnte nicht eingefuegt werden"); nFormatIndex = 0; //! alter Index ist ungueltig } } diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 671812caaa1a..95f7755c6781 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -337,7 +337,7 @@ namespace calc } catch( const Exception& ) { - DBG_ERROR( "OCellListSource::notifyModified: caught a (non-runtime) exception!" ); + OSL_FAIL( "OCellListSource::notifyModified: caught a (non-runtime) exception!" ); } } @@ -414,7 +414,7 @@ namespace calc } catch( const Exception& ) { - DBG_ERROR( "OCellListSource::initialize: caught an exception while retrieving the cell object!" ); + OSL_FAIL( "OCellListSource::initialize: caught an exception while retrieving the cell object!" ); } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 802c0b6d6872..6a2b3e5e3a5d 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1838,7 +1838,7 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, c eRet = beans::PropertyState_AMBIGUOUS_VALUE; else { - DBG_ERROR("unbekannter ItemState"); + OSL_FAIL("unbekannter ItemState"); } } } @@ -2521,7 +2521,7 @@ void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const rtl::OUString& if ( aRanges.empty() ) throw uno::RuntimeException(); - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const rtl::OUString& /* aPropertyName */, @@ -2533,7 +2533,7 @@ void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const rtl::OUStrin if ( aRanges.empty() ) throw uno::RuntimeException(); - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const rtl::OUString&, @@ -2541,7 +2541,7 @@ void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const rtl::OUString&, throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const rtl::OUString&, @@ -2549,7 +2549,7 @@ void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const rtl::OUStrin throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } // XMultiPropertySet @@ -2594,7 +2594,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS } catch ( lang::IllegalArgumentException& ) { - DBG_ERROR("exception when setting cell style"); // not supposed to happen + OSL_FAIL("exception when setting cell style"); // not supposed to happen } } } @@ -2673,20 +2673,20 @@ void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< rtl::OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) throw (uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } IMPL_LINK( ScCellRangesBase, ValueListenerHdl, SfxHint*, pHint ) @@ -2744,7 +2744,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set } catch ( lang::IllegalArgumentException& ) { - DBG_ERROR("exception when setting cell style"); // not supposed to happen + OSL_FAIL("exception when setting cell style"); // not supposed to happen } } } @@ -4980,7 +4980,7 @@ uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() throw return new ScTableColumnsObj( pDocSh, aRange.aStart.Tab(), aRange.aStart.Col(), aRange.aEnd.Col() ); - DBG_ERROR("Dokument ungueltig"); + OSL_FAIL("Dokument ungueltig"); return NULL; } @@ -4992,7 +4992,7 @@ uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() throw(uno:: return new ScTableRowsObj( pDocSh, aRange.aStart.Tab(), aRange.aStart.Row(), aRange.aEnd.Row() ); - DBG_ERROR("Dokument ungueltig"); + OSL_FAIL("Dokument ungueltig"); return NULL; } @@ -5016,7 +5016,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet() if (pDocSh) return new ScTableSheetObj( pDocSh, aRange.aStart.Tab() ); - DBG_ERROR("Dokument ungueltig"); + OSL_FAIL("Dokument ungueltig"); return NULL; } @@ -5755,7 +5755,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil } } - DBG_ERROR("kein Dokument oder kein Bereich"); + OSL_FAIL("kein Dokument oder kein Bereich"); return NULL; } @@ -6496,7 +6496,7 @@ table::CellContentType SAL_CALL ScCellObj::getType() throw(uno::RuntimeException } else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + OSL_FAIL("keine DocShell"); //! Exception oder so? } return eRet; @@ -6531,7 +6531,7 @@ sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException) } else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + OSL_FAIL("keine DocShell"); //! Exception oder so? } return nError; @@ -6596,7 +6596,7 @@ uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation() if ( pDocSh ) return new ScAnnotationObj( pDocSh, aCellPos ); - DBG_ERROR("getAnnotation ohne DocShell"); + OSL_FAIL("getAnnotation ohne DocShell"); return NULL; } @@ -6922,7 +6922,7 @@ uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() throw( if ( pDocSh ) return new ScChartsObj( pDocSh, GetTab_Impl() ); - DBG_ERROR("kein Dokument"); + OSL_FAIL("kein Dokument"); return NULL; } @@ -6934,7 +6934,7 @@ uno::Reference<sheet::XDataPilotTables> SAL_CALL ScTableSheetObj::getDataPilotTa if ( pDocSh ) return new ScDataPilotTablesObj( pDocSh, GetTab_Impl() ); - DBG_ERROR("kein Dokument"); + OSL_FAIL("kein Dokument"); return NULL; } @@ -6946,7 +6946,7 @@ uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() throw if ( pDocSh ) return new ScScenariosObj( pDocSh, GetTab_Impl() ); - DBG_ERROR("kein Dokument"); + OSL_FAIL("kein Dokument"); return NULL; } @@ -6959,7 +6959,7 @@ uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotation if ( pDocSh ) return new ScAnnotationsObj( pDocSh, GetTab_Impl() ); - DBG_ERROR("kein Dokument"); + OSL_FAIL("kein Dokument"); return NULL; } @@ -7198,7 +7198,7 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang case sheet::CellInsertMode_ROWS: eCmd = INS_INSROWS; break; case sheet::CellInsertMode_COLUMNS: eCmd = INS_INSCOLS; break; default: - DBG_ERROR("insertCells: falscher Mode"); + OSL_FAIL("insertCells: falscher Mode"); bDo = FALSE; } @@ -7230,7 +7230,7 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang case sheet::CellDeleteMode_ROWS: eCmd = DEL_DELROWS; break; case sheet::CellDeleteMode_COLUMNS: eCmd = DEL_DELCOLS; break; default: - DBG_ERROR("deleteCells: falscher Mode"); + OSL_FAIL("deleteCells: falscher Mode"); bDo = FALSE; } @@ -7923,7 +7923,7 @@ sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException) if ( pDocSh ) return pDocSh->GetDocument()->IsTabProtected( GetTab_Impl() ); - DBG_ERROR("keine DocShell"); //! Exception oder so? + OSL_FAIL("keine DocShell"); //! Exception oder so? return FALSE; } diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 18c33b49d632..7eeb66573ca9 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -307,7 +307,7 @@ namespace calc break; default: - DBG_ERROR( "OCellValueBinding::getValue: unreachable code!" ); + OSL_FAIL( "OCellValueBinding::getValue: unreachable code!" ); // a type other than double and string should never have survived the checkValueType // above } @@ -393,7 +393,7 @@ namespace calc break; default: - DBG_ERROR( "OCellValueBinding::setValue: unreachable code!" ); + OSL_FAIL( "OCellValueBinding::setValue: unreachable code!" ); // a type other than double and string should never have survived the checkValueType // above } @@ -546,7 +546,7 @@ namespace calc } catch( const Exception& ) { - DBG_ERROR( "OCellValueBinding::notifyModified: caught a (non-runtime) exception!" ); + OSL_FAIL( "OCellValueBinding::notifyModified: caught a (non-runtime) exception!" ); } } } @@ -629,7 +629,7 @@ namespace calc } catch( const Exception& ) { - DBG_ERROR( "OCellValueBinding::initialize: caught an exception while retrieving the cell object!" ); + OSL_FAIL( "OCellValueBinding::initialize: caught an exception while retrieving the cell object!" ); } if ( !m_xCell.is() ) diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 8d7f6e2e755d..98c21cbf760d 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -2425,7 +2425,7 @@ void ScChart2DataSequence::BuildDataCache() if (!m_pTokens.get()) { - DBG_ERROR("m_pTokens == NULL! Something is wrong."); + OSL_FAIL("m_pTokens == NULL! Something is wrong."); return; } @@ -2576,7 +2576,7 @@ sal_Int32 ScChart2DataSequence::FillCacheFromExternalRef(const ScTokenRef& pToke if (p->GetType() != svMatrix) { - DBG_ERROR("Cached array is not a matrix token."); + OSL_FAIL("Cached array is not a matrix token."); continue; } @@ -2678,7 +2678,7 @@ void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r) { if (!m_pDocument) { - DBG_ERROR("document instance is NULL!?"); + OSL_FAIL("document instance is NULL!?"); return; } @@ -2802,7 +2802,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint if (!m_pRangeIndices.get() || m_pRangeIndices->empty()) { - DBG_ERROR(" faulty range indices"); + OSL_FAIL(" faulty range indices"); break; } @@ -2811,7 +2811,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint size_t nCount = rRanges.size(); if (nCount != m_pRangeIndices->size()) { - DBG_ERROR("range count and range index count differ."); + OSL_FAIL("range count and range index count differ."); break; } diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 4030327b9c8f..fd5b97c88fde 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -735,7 +735,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(un return aSeq; } - DBG_ERROR("ScChartObj::getRanges: keine Ranges"); + OSL_FAIL("ScChartObj::getRanges: keine Ranges"); return uno::Sequence<table::CellRangeAddress>(); } diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index 528b506d9f8a..d6139cd578bb 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -168,7 +168,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray() throw(uno::RuntimeExcept // about a exception /*if (!bFound) { - DBG_ERROR("keine Matrix"); + OSL_FAIL("keine Matrix"); //! Exception, oder was? }*/ } @@ -223,7 +223,7 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo SolarMutexGuard aGuard; if ( nColumns <= 0 || nRows <= 0 ) { - DBG_ERROR("leerer Range geht nicht"); + OSL_FAIL("leerer Range geht nicht"); //! und dann? } else diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 229eef11b953..c675d5217771 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -1443,7 +1443,7 @@ void ScDataPilotDescriptor::SetDPObject( ScDPObject* pDPObject ) { delete mpDPObject; mpDPObject = pDPObject; - DBG_ERROR("replace DPObject should not happen"); + OSL_FAIL("replace DPObject should not happen"); } } diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index ebbec5edc344..1728c7002165 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -168,7 +168,7 @@ ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eS case sheet::GeneralFunction_VARP: eSubTotal = SUBTOTAL_FUNC_VARP; break; case sheet::GeneralFunction_AUTO: default: - DBG_ERROR("GeneralToSubTotal: falscher enum"); + OSL_FAIL("GeneralToSubTotal: falscher enum"); eSubTotal = SUBTOTAL_FUNC_NONE; } return eSubTotal; @@ -192,7 +192,7 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e case SUBTOTAL_FUNC_VAR: eGeneral = sheet::GeneralFunction_VAR; break; case SUBTOTAL_FUNC_VARP: eGeneral = sheet::GeneralFunction_VARP; break; default: - DBG_ERROR("SubTotalToGeneral: falscher enum"); + OSL_FAIL("SubTotalToGeneral: falscher enum"); eGeneral = sheet::GeneralFunction_NONE; break; } @@ -300,7 +300,7 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ rParam.nType = ScDbQuery; break; default: - DBG_ERROR("falscher Mode"); + OSL_FAIL("falscher Mode"); rParam.bImport = FALSE; } } @@ -421,7 +421,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b INT32 i; if ( nCount > MAXSORT ) { - DBG_ERROR("Zu viele Sortierfelder"); + OSL_FAIL("Zu viele Sortierfelder"); nCount = MAXSORT; } const util::SortField* pFieldArray = aSeq.getConstArray(); @@ -442,7 +442,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b INT32 i; if ( nCount > MAXSORT ) { - DBG_ERROR("Zu viele Sortierfelder"); + OSL_FAIL("Zu viele Sortierfelder"); nCount = MAXSORT; } const table::TableSortField* pFieldArray = aNewSeq.getConstArray(); @@ -609,12 +609,12 @@ ScSubTotalDescriptorBase::~ScSubTotalDescriptorBase() void ScSubTotalDescriptorBase::GetData( ScSubTotalParam& /* rParam */ ) const { - DBG_ERROR("ScSubTotalDescriptorBase::GetData soll nicht gerufen werden"); + OSL_FAIL("ScSubTotalDescriptorBase::GetData soll nicht gerufen werden"); } void ScSubTotalDescriptorBase::PutData( const ScSubTotalParam& /* rParam */ ) { - DBG_ERROR("ScSubTotalDescriptorBase::PutData soll nicht gerufen werden"); + OSL_FAIL("ScSubTotalDescriptorBase::PutData soll nicht gerufen werden"); } // XSubTotalDesctiptor @@ -1153,7 +1153,7 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte case SC_TOPPERC: aField.Operator = sheet::FilterOperator_TOP_PERCENT; break; case SC_BOTPERC: aField.Operator = sheet::FilterOperator_BOTTOM_PERCENT; break; default: - DBG_ERROR("Falscher Filter-enum"); + OSL_FAIL("Falscher Filter-enum"); aField.Operator = sheet::FilterOperator_EMPTY; } pAry[i] = aField; @@ -1227,7 +1227,7 @@ throw(uno::RuntimeException) case SC_ENDS_WITH: aField.Operator = sheet::FilterOperator2::ENDS_WITH; break; case SC_DOES_NOT_END_WITH: aField.Operator = sheet::FilterOperator2::DOES_NOT_END_WITH; break; default: - DBG_ERROR("Falscher Filter-enum"); + OSL_FAIL("Falscher Filter-enum"); aField.Operator = sheet::FilterOperator2::EMPTY; } pAry[i] = aField; @@ -1297,7 +1297,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields( } break; default: - DBG_ERROR("Falscher Query-enum"); + OSL_FAIL("Falscher Query-enum"); rEntry.eOp = SC_EQUAL; } } @@ -1377,7 +1377,7 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2( } break; default: - DBG_ERROR("Falscher Query-enum"); + OSL_FAIL("Falscher Query-enum"); rEntry.eOp = SC_EQUAL; } } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index d251307ebc56..98e52213ac3b 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1343,7 +1343,7 @@ void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException) pDocShell->DoRecalc(TRUE); else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + OSL_FAIL("keine DocShell"); //! Exception oder so? } } @@ -1354,7 +1354,7 @@ void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException) pDocShell->DoHardRecalc(TRUE); else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + OSL_FAIL("keine DocShell"); //! Exception oder so? } } @@ -1364,7 +1364,7 @@ sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::Runtime if (pDocShell) return pDocShell->GetDocument()->GetAutoCalc(); - DBG_ERROR("keine DocShell"); //! Exception oder so? + OSL_FAIL("keine DocShell"); //! Exception oder so? return FALSE; } @@ -1383,7 +1383,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabled ) } else { - DBG_ERROR("keine DocShell"); //! Exception oder so? + OSL_FAIL("keine DocShell"); //! Exception oder so? } } @@ -1423,7 +1423,7 @@ sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException) if (pDocShell) return pDocShell->GetDocument()->IsDocProtected(); - DBG_ERROR("keine DocShell"); //! Exception oder so? + OSL_FAIL("keine DocShell"); //! Exception oder so? return FALSE; } @@ -1435,7 +1435,7 @@ uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() throw(un if (pDocShell) return new ScDrawPagesObj(pDocShell); - DBG_ERROR("keine DocShell"); //! Exception oder so? + OSL_FAIL("keine DocShell"); //! Exception oder so? return NULL; } diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 915fb82d0b07..f602926ff277 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -352,14 +352,14 @@ void SAL_CALL ScCellFieldsObj::addContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) throw(uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL ScCellFieldsObj::removeContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) throw(uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } // XRefreshable @@ -994,14 +994,14 @@ void SAL_CALL ScHeaderFieldsObj::addContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) throw(uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } void SAL_CALL ScHeaderFieldsObj::removeContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) throw(uno::RuntimeException) { - DBG_ERROR("not implemented"); + OSL_FAIL("not implemented"); } // XRefreshable @@ -1034,6 +1034,10 @@ void SAL_CALL ScHeaderFieldsObj::refresh( ) } catch(uno::RuntimeException&) { +<<<<<<< HEAD +======= +// OSL_FAIL("a object is gone without to remove from Broadcaster"); +>>>>>>> Move DBG_ERROR to OSL_FAIL ++pInterfaces; ++i; } diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 0c745a1f1b8a..aa3f03cab80a 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -382,7 +382,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( } else { - DBG_ERROR("falsche Property"); + OSL_FAIL("falsche Property"); //! Exception... } } diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 3e49c57c23e5..faf3a7eb3d68 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -692,7 +692,7 @@ static BOOL lcl_MayBeDBase( SvStream& rStream ) } else { // Tabellenfehler - DBG_ERROR( "-ScApplication::DetectFilter(): Fehler in Mustertabelle"); + OSL_FAIL( "-ScApplication::DetectFilter(): Fehler in Mustertabelle"); } pSearch++; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 77b19ee44b6c..220a4db28df4 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -393,7 +393,7 @@ sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName) DBG_ASSERT( aOldNames[i], "ScServiceProvider::GetProviderType: no oldname => crash"); if (rServiceName.EqualsAscii( aOldNames[i] )) { - DBG_ERROR("old service name used"); + OSL_FAIL("old service name used"); return i; } } diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index f17b6097775b..73f039def74e 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -577,7 +577,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } else { - DBG_ERROR("unknown anchor type"); + OSL_FAIL("unknown anchor type"); } } } @@ -646,7 +646,7 @@ void SAL_CALL ScShapeObj::setPropertyValue( } else { - DBG_ERROR("unknown anchor type"); + OSL_FAIL("unknown anchor type"); } } } @@ -1126,7 +1126,7 @@ void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet& rSour } catch (uno::Exception&) { - DBG_ERROR("Exception in text field"); + OSL_FAIL("Exception in text field"); } } @@ -1357,7 +1357,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId() } if( NULL == pImplementationId ) { - DBG_ERROR( "Could not create an implementation id for a ScXShape!" ); + OSL_FAIL( "Could not create an implementation id for a ScXShape!" ); return uno::Sequence< sal_Int8 > (); } else diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 49525f450d6c..62db21fdfb11 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -468,7 +468,7 @@ const ScDisplayNameMap* lcl_GetStyleNameMap( UINT16 nType ) } return aPageMap; } - DBG_ERROR("invalid family"); + OSL_FAIL("invalid family"); return NULL; } @@ -590,7 +590,7 @@ ScStyleFamilyObj*ScStyleFamiliesObj::GetObjectByType_Impl(UINT16 nType) const else if ( nType == SFX_STYLE_FAMILY_PAGE ) return new ScStyleFamilyObj( pDocShell, SFX_STYLE_FAMILY_PAGE ); } - DBG_ERROR("getStyleFamilyByType: keine DocShell oder falscher Typ"); + OSL_FAIL("getStyleFamilyByType: keine DocShell oder falscher Typ"); return NULL; } @@ -1377,7 +1377,7 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const rtl::OUString& eRet = beans::PropertyState_AMBIGUOUS_VALUE; // kann eigentlich nicht sein... else { - DBG_ERROR("unbekannter ItemState"); + OSL_FAIL("unbekannter ItemState"); } } } diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index a8f835075883..acc15fa8825c 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -193,7 +193,7 @@ uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks xCollection.set(new ScDatabaseRangesObj(pDocShell)); break; default: - DBG_ERROR("invalid type"); + OSL_FAIL("invalid type"); } } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 71f5bc0d3a42..d94767067ebd 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -213,7 +213,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeExc return pViewData->GetPosX( eWhichH ); } - DBG_ERROR("keine View ?!?"); //! Exception? + OSL_FAIL("keine View ?!?"); //! Exception? return 0; } @@ -247,7 +247,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeExcept return pViewData->GetPosY( eWhichV ); } - DBG_ERROR("keine View ?!?"); //! Exception? + OSL_FAIL("keine View ?!?"); //! Exception? return 0; } diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 94d75a0fe822..80326bc4e6c0 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -868,7 +868,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) break; case FID_INPUTLINE_STATUS: - DBG_ERROR( "Old update method. Use ScTabViewShell::UpdateInputHandler()." ); + OSL_FAIL( "Old update method. Use ScTabViewShell::UpdateInputHandler()." ); break; case SID_SCENARIOS: // Szenarios: diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 882a3c88aae4..dabdc6df2531 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -648,7 +648,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) const SvNumberformat* pPrivEntry = pFormatter->GetEntry( nPrivFormat ); if (!pPrivEntry) { - DBG_ERROR("Zahlformat nicht gefunden !!!"); + OSL_FAIL("Zahlformat nicht gefunden !!!"); } else { @@ -921,7 +921,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } else { - DBG_ERROR( "Richtung nicht eindeutig fuer AutoFill" ); + OSL_FAIL( "Richtung nicht eindeutig fuer AutoFill" ); } } } @@ -1977,7 +1977,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } else { - DBG_ERROR("NULL"); + OSL_FAIL("NULL"); } } } @@ -2073,7 +2073,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // default: - DBG_ERROR("falscher Slot bei ExecuteEdit"); + OSL_FAIL("falscher Slot bei ExecuteEdit"); break; } } diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 5a13c650f639..608cd2b35ed2 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -325,7 +325,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) case SID_SBA_BRW_INSERT: { - DBG_ERROR( "Deprecated Slot" ); + OSL_FAIL( "Deprecated Slot" ); } break; @@ -615,7 +615,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) const SfxItemSet* pArgs = rReq.GetArgs(); if ( pArgs ) { - DBG_ERROR("SID_FILTER with arguments?"); + OSL_FAIL("SID_FILTER with arguments?"); pTabViewShell->Query( ((const ScQueryItem&) pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, TRUE ); rReq.Done(); @@ -636,7 +636,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) const SfxItemSet* pArgs = rReq.GetArgs(); if ( pArgs ) { - DBG_ERROR("SID_SPECIAL_FILTER with arguments?"); + OSL_FAIL("SID_SPECIAL_FILTER with arguments?"); pTabViewShell->Query( ((const ScQueryItem&) pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, TRUE ); rReq.Done(); @@ -770,7 +770,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } else { - DBG_ERROR("NULL"); + OSL_FAIL("NULL"); } } else @@ -838,7 +838,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) const SfxItemSet* pArgs = rReq.GetArgs(); if ( pArgs ) { - DBG_ERROR("spaeter..."); + OSL_FAIL("spaeter..."); } else { diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 76582b3ab844..c791ffc6e088 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -900,7 +900,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) // ---------------------------------------------------------------- case FID_INPUTLINE_STATUS: - DBG_ERROR("Execute von InputLine-Status"); + OSL_FAIL("Execute von InputLine-Status"); break; case SID_STATUS_DOCPOS: @@ -911,11 +911,11 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_MARKAREA: // called from Basic at the hidden view to select a range in the visible view - DBG_ERROR("old slot SID_MARKAREA"); + OSL_FAIL("old slot SID_MARKAREA"); break; default: - DBG_ERROR("Unbekannter Slot bei ScCellShell::Execute"); + OSL_FAIL("Unbekannter Slot bei ScCellShell::Execute"); break; } } diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index f5c4e70ae98a..cf8a0fcb330d 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -200,7 +200,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) break; default: - DBG_ERROR("Unbekannte Message bei ViewShell (Cursor)"); + OSL_FAIL("Unbekannte Message bei ViewShell (Cursor)"); return; } @@ -370,7 +370,7 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) break; default: - DBG_ERROR("Unbekannte Message bei ViewShell (Cursor)"); + OSL_FAIL("Unbekannte Message bei ViewShell (Cursor)"); return; } @@ -387,7 +387,7 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq ) case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break; case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break; default: - DBG_ERROR("Unbekannte Message bei ViewShell (ExecutePageSel)"); + OSL_FAIL("Unbekannte Message bei ViewShell (ExecutePageSel)"); return; } rReq.AppendItem( SfxBoolItem(FN_PARAM_2, TRUE) ); @@ -442,7 +442,7 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) break; default: - DBG_ERROR("Unbekannte Message bei ViewShell (ExecutePage)"); + OSL_FAIL("Unbekannte Message bei ViewShell (ExecutePage)"); return; } diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 6b95b3b4ff8c..98b81701b805 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -262,7 +262,7 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, BOOL bRecord ) rSortParam.nCol2, rSortParam.nRow2 ); if (!pDBData) { - DBG_ERROR( "Sort: keine DBData" ); + OSL_FAIL( "Sort: keine DBData" ); return; } diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index d5e91c586b3f..16962926585e 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -413,7 +413,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, rParam.nCol2, rParam.nRow2 ); if (!pDBData) { - DBG_ERROR( "SubTotals: keine DBData" ); + OSL_FAIL( "SubTotals: keine DBData" ); return; } @@ -1004,7 +1004,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar if ( pExistingGroup && pExistingGroup->GetGroupDimName() == aGroupDimName ) { // still get the same group dimension? - DBG_ERROR("couldn't remove group dimension"); + OSL_FAIL("couldn't remove group dimension"); pExistingGroup = NULL; // avoid endless loop } } diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 33969dfabf38..92b9b07c609c 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -285,7 +285,7 @@ void ScDrawView::UpdateWorkArea() } else { - DBG_ERROR("Page nicht gefunden"); + OSL_FAIL("Page nicht gefunden"); } } @@ -488,7 +488,7 @@ void ScDrawView::MarkListHasChanged() pViewSh->SetVerbs( xObj->getSupportedVerbs() ); else { - DBG_ERROR("SdrOle2Obj ohne ObjRef"); + OSL_FAIL("SdrOle2Obj ohne ObjRef"); pViewSh->SetVerbs( 0 ); } } diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index f2e7b5194e5f..3334cc61dabd 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -904,7 +904,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } else { - DBG_ERROR( "Unknown slot (ScViewShell::ExecuteStyle)" ); + OSL_FAIL( "Unknown slot (ScViewShell::ExecuteStyle)" ); } } @@ -1045,7 +1045,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) break; default: - DBG_ERROR("falscher Slot bei ExecuteEdit"); + OSL_FAIL("falscher Slot bei ExecuteEdit"); break; } } @@ -1127,7 +1127,7 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) pTabViewShell->ApplyAttr( SvxVerJustifyItem( (SvxCellVerJustify)((const SvxVerJustifyItem*)pItem)->GetValue(), ATTR_VER_JUSTIFY ) ); break; default: - DBG_ERROR( "ExecuteAlignment: invalid slot" ); + OSL_FAIL( "ExecuteAlignment: invalid slot" ); return; } } diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 4937d1bdb272..c91f187bdb00 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -470,7 +470,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic eVWhich = SC_SPLIT_BOTTOM; break; default: - DBG_ERROR("GridWindow: falsche Position"); + OSL_FAIL("GridWindow: falsche Position"); } SetBackground(); @@ -1310,7 +1310,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, } else { - DBG_ERROR("Wo ist der Datenbankbereich?"); + OSL_FAIL("Wo ist der Datenbankbereich?"); } } @@ -4148,7 +4148,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) } else { - DBG_ERROR("drop with link: no sheet nor area"); + OSL_FAIL("drop with link: no sheet nor area"); bOk = FALSE; } } diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index df6a7f3e9b10..c9ced7d1003f 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -247,7 +247,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt } else { - DBG_ERROR("Da is ja garnix"); + OSL_FAIL("Da is ja garnix"); } } diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 6ffee6b83764..fb3de52ea43a 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1179,7 +1179,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2 else { // can also be part of DataPilot table - // DBG_ERROR("Auto-Filter-Button ohne DBData"); + // OSL_FAIL("Auto-Filter-Button ohne DBData"); } } @@ -1325,7 +1325,7 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ) pDBData->GetQueryParam( aQueryParam ); else { - DBG_ERROR("Auto-Filter-Button ohne DBData"); + OSL_FAIL("Auto-Filter-Button ohne DBData"); } BOOL bSimpleQuery = TRUE; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 54cfcf147a4f..ade48b0e54f3 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -376,7 +376,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* bRotated = FALSE; break; default: - DBG_ERROR("Falscher SvxCellOrientation Wert"); + OSL_FAIL("Falscher SvxCellOrientation Wert"); nRot = 0; bRotated = FALSE; break; @@ -2670,7 +2670,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } else { - DBG_ERROR("pData == 0"); + OSL_FAIL("pData == 0"); } } else @@ -2698,7 +2698,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } else { - DBG_ERROR("pCell == NULL"); + OSL_FAIL("pCell == NULL"); } pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight @@ -3438,7 +3438,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) pEngine->SetText(*pData); else { - DBG_ERROR("pData == 0"); + OSL_FAIL("pData == 0"); } } else @@ -3466,7 +3466,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) } else { - DBG_ERROR("pCell == NULL"); + OSL_FAIL("pCell == NULL"); } pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index c17ee98042d0..bc87c1bc0a17 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -842,7 +842,7 @@ Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab ) } else { - DBG_ERROR( "PageStyle not found" ); + OSL_FAIL( "PageStyle not found" ); return Size(); } } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index f204852f754b..78d567627fa2 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -235,7 +235,7 @@ Size ScPreviewShell::GetOptimalSizePixel() const } else { - DBG_ERROR( "TabViewShell not found :-/" ); + OSL_FAIL( "TabViewShell not found :-/" ); } return aOptSize; @@ -1204,7 +1204,7 @@ void ScPreviewShell::RemoveAccessibilityObject( SfxListener& rObject ) rObject.EndListening( *pAccessibilityBroadcaster ); else { - DBG_ERROR("kein Accessibility-Broadcaster?"); + OSL_FAIL("kein Accessibility-Broadcaster?"); } } diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 71cdeb26b3fc..0688ea01e42c 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -132,7 +132,7 @@ void ScPageRowEntry::SetPagesX(size_t nNew) { if (pHidden) { - DBG_ERROR("SetPagesX nicht nach SetHidden"); + OSL_FAIL("SetPagesX nicht nach SetHidden"); delete[] pHidden; pHidden = NULL; } @@ -214,7 +214,7 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions ) pParamSet = &pStyleSheet->GetItemSet(); else { - DBG_ERROR("Seitenvorlage nicht gefunden" ); + OSL_FAIL("Seitenvorlage nicht gefunden" ); pParamSet = NULL; } @@ -881,7 +881,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) aPageSize = ((const SvxSizeItem&) pParamSet->Get(ATTR_PAGE_SIZE)).GetSize(); if ( !aPageSize.Width() || !aPageSize.Height() ) { - DBG_ERROR("PageSize Null ?!?!?"); + OSL_FAIL("PageSize Null ?!?!?"); aPageSize = SvxPaperInfo::GetPaperSize( PAPER_A4 ); } @@ -2013,7 +2013,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr if ( pPrinter && bDoPrint ) { - DBG_ERROR( "StartPage does not exist anymore" ); + OSL_FAIL( "StartPage does not exist anymore" ); } if ( bDoPrint || pLocationData ) @@ -2036,7 +2036,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr if ( pPrinter && bDoPrint ) { - DBG_ERROR( "EndPage does not exist anymore" ); + OSL_FAIL( "EndPage does not exist anymore" ); } return nCount; @@ -2101,7 +2101,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO if ( pPrinter && bDoPrint ) { - DBG_ERROR( "StartPage does not exist anymore" ); + OSL_FAIL( "StartPage does not exist anymore" ); } // Kopf- und Fusszeilen (ohne Zentrierung) @@ -2382,7 +2382,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO if ( pPrinter && bDoPrint ) { - DBG_ERROR( "EndPage does not exist anymore" ); + OSL_FAIL( "EndPage does not exist anymore" ); } aLastSourceRange = ScRange( nX1, nY1, nPrintTab, nX2, nY2, nPrintTab ); diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 9bc33b63cb50..084831822fb1 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -505,7 +505,7 @@ USHORT lcl_DocShellNr( ScDocument* pDoc ) pShell = SfxObjectShell::GetNext( *pShell ); } - DBG_ERROR("Dokument nicht gefunden"); + OSL_FAIL("Dokument nicht gefunden"); return 0; } @@ -602,7 +602,7 @@ long ScTabControl::AllowRenaming() // if the error message from this TabControl is currently visible, // don't end edit mode now, to avoid problems when returning to // the other call (showing the error) - this should not happen - DBG_ERROR("ScTabControl::AllowRenaming: nested calls"); + OSL_FAIL("ScTabControl::AllowRenaming: nested calls"); nRet = TABBAR_RENAMING_NO; } else if ( Application::IsInModalMode() ) diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 8d45d2342567..3ba37be06ae0 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2127,7 +2127,7 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel ) Window* pWin = pGridWin[ePos]; if (!pWin) { - DBG_ERROR("Window NULL"); + OSL_FAIL("Window NULL"); return; } diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 546864f7fddb..76b820cb3fbf 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -214,7 +214,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, if (!bIsBlockMode) { - DBG_ERROR( "MarkCursor nicht im BlockMode" ); + OSL_FAIL( "MarkCursor nicht im BlockMode" ); InitBlockMode( nCurX, nCurY, nCurZ, FALSE, bCols, bRows ); } @@ -1189,7 +1189,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) break; default: - DBG_ERROR("Unknown Zoom-Revision"); + OSL_FAIL("Unknown Zoom-Revision"); nZoom = 0; } diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 4b3f6a4043bc..8320b9277668 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -797,7 +797,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, case SC_FOLLOW_NONE: break; default: - DBG_ERROR("Falscher Cursormodus"); + OSL_FAIL("Falscher Cursormodus"); break; } @@ -1431,7 +1431,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) { if ( !ValidTab(nTab) ) { - DBG_ERROR("SetTabNo: falsche Tabelle"); + OSL_FAIL("SetTabNo: falsche Tabelle"); return; } @@ -1482,7 +1482,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) --nTab; else { - DBG_ERROR("keine sichtbare Tabelle"); + OSL_FAIL("keine sichtbare Tabelle"); pDoc->SetVisible( 0, TRUE ); } } diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index ee89b3b74915..021ad0b2bd0e 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -529,7 +529,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // View aufgerufen, um auf der sichtbaren View zu markieren/umzuschalten: case SID_TABLE_ACTIVATE: - DBG_ERROR("old slot SID_TABLE_ACTIVATE"); + OSL_FAIL("old slot SID_TABLE_ACTIVATE"); break; case SID_REPAINT: @@ -1150,7 +1150,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) break; default: - DBG_ERROR("Unbekannter Slot bei ScTabViewShell::Execute"); + OSL_FAIL("Unbekannter Slot bei ScTabViewShell::Execute"); break; } } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 436c229d27db..ddbb0903ff06 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -984,7 +984,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; default: - DBG_ERROR("Falsche Shell angefordert"); + OSL_FAIL("Falsche Shell angefordert"); break; } @@ -1074,7 +1074,7 @@ void ScTabViewShell::SetDrawTextUndo( SfxUndoManager* pNewUndoMgr ) } else { - DBG_ERROR("SetDrawTextUndo ohne DrawTextShell"); + OSL_FAIL("SetDrawTextUndo ohne DrawTextShell"); } } @@ -1996,7 +1996,7 @@ void ScTabViewShell::ExecTbx( SfxRequest& rReq ) nInsObjCtrlState = ((const SfxUInt16Item*)pItem)->GetValue(); break; default: - DBG_ERROR("Slot im Wald"); + OSL_FAIL("Slot im Wald"); } GetViewFrame()->GetBindings().Invalidate( nSlot ); } diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index ef6c70b92a88..93bde6c52c8b 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -240,7 +240,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) case SC_TAB_HIDDEN: break; default: - DBG_ERROR("unbekannter ScTablesHint"); + OSL_FAIL("unbekannter ScTablesHint"); } // hier keine Abfrage auf IsActive() mehr, weil die Aktion von Basic ausgehen diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index f5e73e6a11ca..87b77be56fbe 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -200,7 +200,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) } catch( const uno::Exception & ) { - DBG_ERROR( "Exception caught while querying chart" ); + OSL_FAIL( "Exception caught while querying chart" ); } } } @@ -240,7 +240,7 @@ ErrCode ScTabViewShell::DoVerb(long nVerb) } else { - DBG_ERROR("kein Objekt fuer Verb gefunden"); + OSL_FAIL("kein Objekt fuer Verb gefunden"); } return nErr; diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 9bd1efdcd521..b3c314af66a5 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -312,7 +312,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( default: - DBG_ERROR( "ScTabViewShell::CreateRefDialog: unbekannte ID" ); + OSL_FAIL( "ScTabViewShell::CreateRefDialog: unbekannte ID" ); break; } diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 7e99ef7fc064..77be8ad7e678 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -275,7 +275,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) } else { - DBG_ERROR("SID_SEARCH_ITEM ohne Parameter"); + OSL_FAIL("SID_SEARCH_ITEM ohne Parameter"); } break; case FID_SEARCH: diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 9c987f17207d..52bfd4213050 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -823,7 +823,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) break; default: - DBG_ERROR("Unbekannte Message bei ViewShell"); + OSL_FAIL("Unbekannte Message bei ViewShell"); break; } } diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index c462c48abe9c..7c55632fdbd8 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -81,7 +81,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) ScTabViewShell* pVisibleSh = this; if ( nSlotId == SID_OLE_SELECT || nSlotId == SID_OLE_ACTIVATE || nSlotId == SID_OLE_DEACTIVATE ) { - DBG_ERROR("old slot SID_OLE..."); + OSL_FAIL("old slot SID_OLE..."); } switch (nSlotId) @@ -258,7 +258,7 @@ void ScTabViewShell::RemoveAccessibilityObject( SfxListener& rObject ) } else { - DBG_ERROR("kein Accessibility-Broadcaster?"); + OSL_FAIL("kein Accessibility-Broadcaster?"); } } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index df4571dd23df..e6ea0e9b46ef 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -430,7 +430,7 @@ ScDocument* ScViewData::GetDocument() const else if (pDocShell) return pDocShell->GetDocument(); - DBG_ERROR("kein Document an ViewData"); + OSL_FAIL("kein Document an ViewData"); return NULL; } @@ -496,7 +496,7 @@ void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab ) if (nDestTab > MAXTAB) { - DBG_ERROR("Zuviele Tabellen"); + OSL_FAIL("Zuviele Tabellen"); return; } @@ -915,7 +915,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, if (pEditView[eWhich]->GetWindow() != pWin) { pEditView[eWhich]->SetWindow(pWin); - DBG_ERROR("EditView Window geaendert"); + OSL_FAIL("EditView Window geaendert"); } } else @@ -1433,7 +1433,7 @@ void ScViewData::SetTabNo( SCTAB nNewTab ) { if (!ValidTab(nNewTab)) { - DBG_ERROR("falsche Tabellennummer"); + OSL_FAIL("falsche Tabellennummer"); return; } @@ -1815,7 +1815,7 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, if ( ( bHOver && pMerge->GetColMerge() <= 1 ) || ( bVOver && pMerge->GetRowMerge() <= 1 ) ) { - DBG_ERROR("Merge-Fehler gefunden"); + OSL_FAIL("Merge-Fehler gefunden"); pDoc->RemoveFlagsTab( 0,0, MAXCOL,MAXROW, nTabNo, SC_MF_HOR | SC_MF_VER ); SCCOL nEndCol = MAXCOL; @@ -2234,7 +2234,7 @@ void ScViewData::ReadUserData(const String& rData) { // #45208# beim Reload in der Seitenansicht sind evtl. die Preview-UserData // stehengelassen worden. Den Zoom von der Preview will man hier nicht... - DBG_ERROR("ReadUserData: das sind nicht meine Daten"); + OSL_FAIL("ReadUserData: das sind nicht meine Daten"); return; } @@ -2331,7 +2331,7 @@ void ScViewData::ReadUserData(const String& rData) { // dann wieder auf Default (unten links) pTabData[nPos]->eWhichActive = SC_SPLIT_BOTTOMLEFT; - DBG_ERROR("SplitPos musste korrigiert werden"); + OSL_FAIL("SplitPos musste korrigiert werden"); } } ++nPos; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 4531fa512831..f3cf8dd7ee73 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2501,7 +2501,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy, const if (!pDestShell) { - DBG_ERROR("Dest-Doc nicht gefunden !!!"); + OSL_FAIL("Dest-Doc nicht gefunden !!!"); return; } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 53765f844bdd..adf4ef348dcd 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -951,7 +951,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, { if (!pClipDoc) { - DBG_ERROR("PasteFromClip: pClipDoc=0 not allowed"); + OSL_FAIL("PasteFromClip: pClipDoc=0 not allowed"); return FALSE; } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index e4a08ac956e0..888ab6256568 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -402,7 +402,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) } else { - DBG_ERROR("DoThesaurus: Keine String oder Editzelle"); + OSL_FAIL("DoThesaurus: Keine String oder Editzelle"); } pEditView = GetViewData()->GetEditView(GetViewData()->GetActivePart());; if (pEditSel) diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 98146947d007..04b792458132 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -207,7 +207,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else { - DBG_ERROR("Error in CreateAndLoad"); + OSL_FAIL("Error in CreateAndLoad"); } } } @@ -280,7 +280,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else { - DBG_ERROR("Error creating external OLE object"); + OSL_FAIL("Error creating external OLE object"); } } //TODO/LATER: if format is not available, create picture @@ -562,7 +562,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else { - DBG_ERROR("no dimension"); //! possible? + OSL_FAIL("no dimension"); //! possible? SCCOL nFirstCol, nLastCol; SCROW nFirstRow, nLastRow; if ( pInsDoc->GetDataStart( nSrcTab, nFirstCol, nFirstRow ) ) @@ -634,7 +634,7 @@ ByteString lcl_GetSubString( sal_Char* pData, long nStart, long nDataSize ) { if ( nDataSize <= nStart /* || pData[nDataSize] != 0 */ ) { - DBG_ERROR("DDE Data: invalid data"); + OSL_FAIL("DDE Data: invalid data"); return ByteString(); } return ByteString( pData + nStart ); @@ -650,7 +650,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx uno::Sequence<sal_Int8> aSequence; if ( !aDataHelper.GetSequence( SOT_FORMATSTR_ID_LINK, aSequence ) ) { - DBG_ERROR("DDE Data not found."); + OSL_FAIL("DDE Data not found."); return FALSE; } diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 6b4387b16b90..0c2272738be4 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -307,7 +307,7 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X if( aSize.Height() == 0 || aSize.Width() == 0 ) { - DBG_ERROR("SvObjectDescriptor::GetSize == 0"); + OSL_FAIL("SvObjectDescriptor::GetSize == 0"); aSize.Width() = 5000; aSize.Height() = 5000; aSize = OutputDevice::LogicToLogic( aSize, aMap100, aMapObj ); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index bc30a8e31eb3..9e09d9872e3d 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -2775,7 +2775,7 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) const SvNumberformat* pOldEntry = pFormatter->GetEntry( nOldFormat ); if (!pOldEntry) { - DBG_ERROR("Zahlformat nicht gefunden !!!"); + OSL_FAIL("Zahlformat nicht gefunden !!!"); return; } |