summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-01 19:05:02 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-02 14:58:56 +0100
commita6e69f8fcd017519c37be409097108da6a6fcb33 (patch)
tree5906fed0faf294ccc3cc54a77a878e7b91a16f31 /sc/source/ui/view
parent775a632985975057f5fa6c196aaffcd0a05e617a (diff)
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/cellsh.cxx2
-rw-r--r--sc/source/ui/view/cellsh1.cxx8
-rw-r--r--sc/source/ui/view/cellsh2.cxx10
-rw-r--r--sc/source/ui/view/cellsh3.cxx6
-rw-r--r--sc/source/ui/view/cellsh4.cxx8
-rw-r--r--sc/source/ui/view/dbfunc.cxx2
-rw-r--r--sc/source/ui/view/dbfunc3.cxx4
-rw-r--r--sc/source/ui/view/drawview.cxx4
-rw-r--r--sc/source/ui/view/formatsh.cxx6
-rw-r--r--sc/source/ui/view/gridwin.cxx6
-rw-r--r--sc/source/ui/view/gridwin2.cxx2
-rw-r--r--sc/source/ui/view/gridwin4.cxx4
-rw-r--r--sc/source/ui/view/output2.cxx10
-rw-r--r--sc/source/ui/view/preview.cxx2
-rw-r--r--sc/source/ui/view/prevwsh.cxx4
-rw-r--r--sc/source/ui/view/printfun.cxx14
-rw-r--r--sc/source/ui/view/tabcont.cxx4
-rw-r--r--sc/source/ui/view/tabview.cxx2
-rw-r--r--sc/source/ui/view/tabview2.cxx4
-rw-r--r--sc/source/ui/view/tabview3.cxx6
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx6
-rw-r--r--sc/source/ui/view/tabvwsh5.cxx2
-rw-r--r--sc/source/ui/view/tabvwshb.cxx4
-rw-r--r--sc/source/ui/view/tabvwshc.cxx2
-rw-r--r--sc/source/ui/view/tabvwshe.cxx2
-rw-r--r--sc/source/ui/view/tabvwshf.cxx2
-rw-r--r--sc/source/ui/view/tabvwshh.cxx4
-rw-r--r--sc/source/ui/view/viewdata.cxx14
-rw-r--r--sc/source/ui/view/viewfun2.cxx2
-rw-r--r--sc/source/ui/view/viewfun3.cxx2
-rw-r--r--sc/source/ui/view/viewfun4.cxx2
-rw-r--r--sc/source/ui/view/viewfun5.cxx10
-rw-r--r--sc/source/ui/view/viewfun7.cxx2
-rw-r--r--sc/source/ui/view/viewfunc.cxx2
35 files changed, 84 insertions, 84 deletions
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;
}