diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-16 04:58:29 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-16 04:58:59 +0100 |
commit | fd17ba6a421acf63b3b959138bb572498d56d469 (patch) | |
tree | 26d134d7f30bc7187c5a4df49162ac4e79793b42 /sc/source | |
parent | f63423d58551b387dd9617c6c84719a95ee6d522 (diff) |
sc: translate some debug messages
Change-Id: I0c741d2cda4568aef81a18788a764f3ef679660c
Diffstat (limited to 'sc/source')
51 files changed, 184 insertions, 184 deletions
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index ebf246a00ca6..a47392e7ea70 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1091,7 +1091,7 @@ bool ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight, bool bTop, SCROW nDistBottom ) { - OSL_ENSURE( pBoxItem && pBoxInfoItem, "Linienattribute fehlen!" ); + OSL_ENSURE( pBoxItem && pBoxInfoItem, "Missing line attributes!" ); const ScPatternAttr* pPattern = GetPattern( nStartRow ); const SvxBoxItem* pOldFrame = (const SvxBoxItem*) diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index e8a39ad580ad..14bdc307bd7c 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1204,7 +1204,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize ) for (i = 0; i < nDelCount; i++) { ScBaseCell* pCell = ppDelCells[i]; - OSL_ENSURE( pCell->IsBlank(), "sichtbare Zelle weggeschoben" ); + OSL_ENSURE( pCell->IsBlank(), "visible cell moved away" ); SvtBroadcaster* pBC = pCell->GetBroadcaster(); if (pBC) { @@ -1417,7 +1417,7 @@ void ScColumn::CopyToColumn( } else { - OSL_FAIL("CopyToColumn: bMarked, aber keine Markierung"); + OSL_FAIL("CopyToColumn: bMarked, but no mark"); } return; } diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 4683b4a68187..fbda30227ce2 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1139,7 +1139,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const bValid = !bValid; break; default: - SAL_WARN("sc", "unbekannte Operation bei ScConditionEntry"); + SAL_WARN("sc", "unknown operation at ScConditionEntry"); break; } return bValid; @@ -2134,7 +2134,7 @@ ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey ) if (itr->GetKey() == nKey) return &(*itr); - SAL_WARN("sc", "ScConditionalFormatList: Eintrag nicht gefunden"); + SAL_WARN("sc", "ScConditionalFormatList: Entry not found"); return NULL; } diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index f3001a5a6b8c..ea867f97e718 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -628,7 +628,7 @@ void ScDocumentPool::Remove( const SfxPoolItem& rItem ) { if ( nRef != (sal_uLong) SC_SAFE_POOLREF ) { - OSL_FAIL("Wer fummelt da an meinen Ref-Counts herum"); + OSL_FAIL("Who fiddles with my ref counts?"); SetRefCount( (SfxPoolItem&)rItem, (sal_uLong) SC_SAFE_POOLREF ); } return; // nicht herunterzaehlen diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 1d159dbafacf..64eb25ac65b8 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -438,7 +438,7 @@ ScDocument::~ScDocument() void ScDocument::InitClipPtrs( ScDocument* pSourceDoc ) { - OSL_ENSURE(bIsClip, "InitClipPtrs und nicht bIsClip"); + OSL_ENSURE(bIsClip, "InitClipPtrs and not bIsClip"); if (pValidationList) { @@ -771,7 +771,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM // vorneweg testen, ob der Prefix als gueltig erkannt wird // wenn nicht, nur doppelte vermeiden bool bPrefix = ValidTabName( aName ); - OSL_ENSURE(bPrefix, "ungueltiger Tabellenname"); + OSL_ENSURE(bPrefix, "invalid table name"); SCTAB nDummy; CreateValidTabName(aName); diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 55e01eb1813c..f2fc8199d746 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -851,7 +851,7 @@ bool ScDocument::TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const && nDestTab < static_cast<SCTAB>(maTabs.size())&& ValidTab(nDestTab)) return maTabs[nSrcTab]->TestCopyScenarioTo( maTabs[nDestTab] ); - OSL_FAIL("falsche Tabelle bei TestCopyScenario"); + OSL_FAIL("wrong table at TestCopyScenario"); return false; } @@ -1056,7 +1056,7 @@ void ScDocument::UpdateReference( UpdateRefMode eUpdateRefMode, void ScDocument::UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDoc, const ScMarkData& rMark, ScDocument* pUndoDoc ) { - OSL_ENSURE(pClipDoc->bIsClip, "UpdateTranspose: kein Clip"); + OSL_ENSURE(pClipDoc->bIsClip, "UpdateTranspose: No Clip"); ScRange aSource; ScClipParam& rClipParam = GetClipParam(); @@ -1615,7 +1615,7 @@ Rectangle ScDocument::GetEmbeddedRect() const // 1/100 mm OSL_FAIL("table out of range"); if (!pTable) { - OSL_FAIL("GetEmbeddedRect ohne Tabelle"); + OSL_FAIL("GetEmbeddedRect without a table"); } else { @@ -1707,7 +1707,7 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect, bool bHidden OSL_FAIL("table out of range"); if (!pTable) { - OSL_FAIL("GetRange ohne Tabelle"); + OSL_FAIL("GetRange without a table"); return ScRange(); } @@ -1807,7 +1807,7 @@ bool ScDocument::IsTabProtected( SCTAB nTab ) const if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) return maTabs[nTab]->IsProtected(); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("Wrong table number"); return false; } @@ -1894,7 +1894,7 @@ Rectangle ScDocument::GetMMRect( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol { if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab]) { - OSL_FAIL("GetMMRect: falsche Tabelle"); + OSL_FAIL("GetMMRect: wrong table"); return Rectangle(0,0,0,0); } diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 6299578e27e8..6bd34a46c859 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -124,7 +124,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, nRow2 = std::min<SCROW>(nRow2, MAXROW); if (!rMark.GetSelectCount()) { - SAL_WARN("sc", "ScDocument::InsertMatrixFormula Keine Tabelle markiert"); + SAL_WARN("sc", "ScDocument::InsertMatrixFormula: No table marked"); return; } @@ -220,7 +220,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera nTab1 = i; if (!bStop) { - OSL_FAIL("ScDocument::InsertTableOp: Keine Tabelle markiert"); + OSL_FAIL("ScDocument::InsertTableOp: No table marked"); return; } @@ -432,7 +432,7 @@ void ScDocument::DoColResize( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd maTabs[nTab]->DoColResize( nCol1, nCol2, nAdd ); else { - OSL_FAIL("DoColResize: falsche Tabelle"); + OSL_FAIL("DoColResize: wrong table"); } } @@ -647,7 +647,7 @@ const SfxPoolItem* ScDocument::GetEffItem( } return &rSet.Get( nWhich ); } - OSL_FAIL("kein Pattern"); + OSL_FAIL("no pattern"); return NULL; } @@ -694,7 +694,7 @@ ScConditionalFormat* ScDocument::GetCondFormat( return pCondFormList->GetFormat( nIndex ); else { - OSL_FAIL("pCondFormList ist 0"); + OSL_FAIL("pCondFormList is 0"); } } @@ -805,7 +805,7 @@ sal_uInt16 ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, if (nUsed > 0) return static_cast<sal_uInt16>((nDif*64)/nUsed); // max.256 (SC_DOCCOMP_MAXDIFF) - OSL_ENSURE(!nDif,"Diff ohne Used"); + OSL_ENSURE(!nDif,"Diff withoud Used"); return 0; } @@ -846,7 +846,7 @@ sal_uInt16 ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab, if (nUsed > 0) return static_cast<sal_uInt16>((nDif*64)/nUsed); // max.256 - OSL_ENSURE(!nDif,"Diff ohne Used"); + OSL_ENSURE(!nDif,"Diff without Used"); return 0; } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 16d427790f6c..3a1247ad2cb8 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1761,7 +1761,7 @@ bool ScDocument::IsCutMode() return GetClipParam().mbCutMode; else { - OSL_FAIL("IsCutMode ohne bIsClip"); + OSL_FAIL("IsCutMode without bIsClip"); return false; } } @@ -2658,7 +2658,7 @@ void ScDocument::SetClipArea( const ScRange& rArea, bool bCut ) } else { - OSL_FAIL("SetClipArea: kein Clip"); + OSL_FAIL("SetClipArea: No Clip"); } } @@ -2667,7 +2667,7 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, bool bIncludeFiltered { if (!bIsClip) { - OSL_FAIL("GetClipArea: kein Clip"); + OSL_FAIL("GetClipArea: No Clip"); return; } @@ -2729,7 +2729,7 @@ void ScDocument::GetClipStart(SCCOL& nClipX, SCROW& nClipY) } else { - OSL_FAIL("GetClipStart: kein Clip"); + OSL_FAIL("GetClipStart: No Clip"); } } @@ -2824,7 +2824,7 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, } else { - OSL_FAIL("falsche Tabelle"); + OSL_FAIL("wrong table"); } } @@ -2885,7 +2885,7 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, } else { - OSL_FAIL("falsche Tabelle"); + OSL_FAIL("wrong table"); } } @@ -3166,7 +3166,7 @@ void ScDocument::GetCell( SCCOL nCol, SCROW nRow, SCTAB nTab, rpCell = maTabs[nTab]->GetCell( nCol, nRow ); else { - OSL_FAIL("GetCell ohne Tabelle"); + OSL_FAIL("GetCell without a table"); rpCell = NULL; } } @@ -3178,7 +3178,7 @@ ScBaseCell* ScDocument::GetCell( const ScAddress& rPos ) const if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) return maTabs[nTab]->GetCell( rPos ); - OSL_FAIL("GetCell ohne Tabelle"); + OSL_FAIL("GetCell without a table"); return NULL; } @@ -3499,7 +3499,7 @@ sal_uInt16 ScDocument::GetColWidth( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetColWidth( nCol, bHiddenAsZero ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return 0; } @@ -3508,7 +3508,7 @@ sal_uInt16 ScDocument::GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetOriginalWidth( nCol ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return 0; } @@ -3592,7 +3592,7 @@ SCROW ScDocument::GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetHiddenRowCount( nRow ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return 0; } @@ -3601,7 +3601,7 @@ sal_uLong ScDocument::GetColOffset( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetColOffset( nCol, bHiddenAsZero ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return 0; } @@ -3610,7 +3610,7 @@ sal_uLong ScDocument::GetRowOffset( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetRowOffset( nRow, bHiddenAsZero ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return 0; } @@ -3624,7 +3624,7 @@ sal_uInt16 ScDocument::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetOptimalColWidth( nCol, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bFormula, pMarkData, pParam ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return 0; } @@ -3638,7 +3638,7 @@ long ScDocument::GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetNeededSize ( nCol, nRow, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bWidth, bTotalSize ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return 0; } @@ -3653,7 +3653,7 @@ bool ScDocument::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, s if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->SetOptimalHeight( nStartRow, nEndRow, nExtra, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bShrink ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return false; } @@ -3725,7 +3725,7 @@ sal_uInt8 ScDocument::GetColFlags( SCCOL nCol, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetColFlags( nCol ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return 0; } @@ -3733,7 +3733,7 @@ sal_uInt8 ScDocument::GetRowFlags( SCROW nRow, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetRowFlags( nRow ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return 0; } @@ -4442,7 +4442,7 @@ bool ScDocument::ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, if (maTabs[nTab]) return maTabs[nTab]->ApplyFlags( nStartCol, nStartRow, nEndCol, nEndRow, nFlags ); - OSL_FAIL("ApplyFlags: falsche Tabelle"); + OSL_FAIL("ApplyFlags: wrong table"); return false; } @@ -4454,7 +4454,7 @@ bool ScDocument::RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, if (maTabs[nTab]) return maTabs[nTab]->RemoveFlags( nStartCol, nStartRow, nEndCol, nEndRow, nFlags ); - OSL_FAIL("RemoveFlags: falsche Tabelle"); + OSL_FAIL("RemoveFlags: wrong table"); return false; } @@ -4658,7 +4658,7 @@ void ScDocument::FindMaxRotCol( SCTAB nTab, RowInfo* pRowInfo, SCSIZE nArrCount, maTabs[nTab]->FindMaxRotCol( pRowInfo, nArrCount, nX1, nX2 ); else { - OSL_FAIL("FindMaxRotCol: falsche Tabelle"); + OSL_FAIL("FindMaxRotCol: wrong table"); } } @@ -4669,7 +4669,7 @@ void ScDocument::GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, //! Seitengrenzen fuer Druck beruecksichtigen !!!!! const SvxBoxItem* pThisAttr = (const SvxBoxItem*) GetEffItem( nCol, nRow, nTab, ATTR_BORDER ); - OSL_ENSURE(pThisAttr,"wo ist das Attribut?"); + OSL_ENSURE(pThisAttr,"where is the attribute?"); const SvxBorderLine* pLeftLine = pThisAttr->GetLeft(); const SvxBorderLine* pTopLine = pThisAttr->GetTop(); @@ -4722,7 +4722,7 @@ bool ScDocument::IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, if (maTabs[nTab]) return maTabs[nTab]->IsBlockEmpty( nStartCol, nStartRow, nEndCol, nEndRow, bIgnoreNotes ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); return false; } @@ -4733,7 +4733,7 @@ void ScDocument::LockTable(SCTAB nTab) maTabs[nTab]->LockTable(); else { - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); } } @@ -4744,7 +4744,7 @@ void ScDocument::UnlockTable(SCTAB nTab) maTabs[nTab]->UnlockTable(); else { - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); } } @@ -4766,7 +4766,7 @@ bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, return maTabs[nTab]->IsBlockEditable( nStartCol, nStartRow, nEndCol, nEndRow, pOnlyNotBecauseOfMatrix ); - OSL_FAIL("Falsche Tabellennummer"); + OSL_FAIL("wrong table number"); if ( pOnlyNotBecauseOfMatrix ) *pOnlyNotBecauseOfMatrix = false; return false; @@ -4909,7 +4909,7 @@ bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, SCROW nAttrPos = nOldRow; while (nAttrPos<=nEndRow) { - OSL_ENSURE( nIndex < pAttrArray->nCount, "Falscher Index im AttrArray" ); + OSL_ENSURE( nIndex < pAttrArray->nCount, "Wrong index in AttrArray" ); if (((ScMergeFlagAttr&)pAttrArray->pData[nIndex].pPattern-> GetItem(ATTR_MERGE_FLAG)).IsHorOverlapped()) @@ -4933,7 +4933,7 @@ bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, } else { - OSL_FAIL("ExtendOverlapped: falscher Bereich"); + OSL_FAIL("ExtendOverlapped: invalid range"); } return bFound; @@ -4984,7 +4984,7 @@ bool ScDocument::ExtendMerge( SCCOL nStartCol, SCROW nStartRow, } else { - OSL_FAIL("ExtendMerge: falscher Bereich"); + OSL_FAIL("ExtendMerge: invalid range"); } return bFound; @@ -5280,7 +5280,7 @@ void ScDocument::DeleteSelectionTab( SCTAB nTab, sal_uInt16 nDelFlag, const ScMa maTabs[nTab]->DeleteSelection( nDelFlag, rMark ); else { - OSL_FAIL("Falsche Tabelle"); + OSL_FAIL("wrong table"); } } @@ -5332,7 +5332,7 @@ void ScDocument::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, ScMoveDirect void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY, bool bMarked, bool bUnprotected, const ScMarkData& rMark ) const { - OSL_ENSURE( !nMovX || !nMovY, "GetNextPos: nur X oder Y" ); + OSL_ENSURE( !nMovX || !nMovY, "GetNextPos: only X or Y" ); ScMarkData aCopyMark = rMark; aCopyMark.SetMarking(false); @@ -5450,7 +5450,7 @@ Size ScDocument::GetPageSize( SCTAB nTab ) const if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->GetPageSize(); - OSL_FAIL("falsche Tab"); + OSL_FAIL("invalid tab"); return Size(); } @@ -5484,7 +5484,7 @@ bool ScDocument::HasManualBreaks( SCTAB nTab ) const if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) return maTabs[nTab]->HasManualBreaks(); - OSL_FAIL("falsche Tab"); + OSL_FAIL("invalid tab"); return false; } diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index aeb84e276830..695036ba8488 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -113,7 +113,7 @@ ScUndoObjData::~ScUndoObjData() void ScUndoObjData::Undo() { ScDrawObjData* pData = ScDrawLayer::GetObjData( pObj ); - OSL_ENSURE(pData,"ScUndoObjData: Daten nicht da"); + OSL_ENSURE(pData,"ScUndoObjData: Data missing"); if (pData) { pData->maStart = aOldStt; @@ -124,7 +124,7 @@ void ScUndoObjData::Undo() void ScUndoObjData::Redo() { ScDrawObjData* pData = ScDrawLayer::GetObjData( pObj ); - OSL_ENSURE(pData,"ScUndoObjData: Daten nicht da"); + OSL_ENSURE(pData,"ScUndoObjData: Data missing"); if (pData) { pData->maStart = aNewStt; @@ -488,7 +488,7 @@ void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SC SCsCOL nDx,SCsROW nDy, bool bUpdateNoteCaptionPos ) { SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab)); - OSL_ENSURE(pPage,"Page nicht gefunden"); + OSL_ENSURE(pPage,"Page not found"); if (!pPage) return; @@ -893,7 +893,7 @@ sal_Bool ScDrawLayer::GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool return false; SCTAB nTab = rRange.aStart.Tab(); - OSL_ENSURE( rRange.aEnd.Tab() == nTab, "GetPrintArea: Tab unterschiedlich" ); + OSL_ENSURE( rRange.aEnd.Tab() == nTab, "GetPrintArea: Tab differ" ); sal_Bool bNegativePage = pDoc->IsNegativePage( nTab ); @@ -936,7 +936,7 @@ sal_Bool ScDrawLayer::GetPrintArea( ScRange& rRange, sal_Bool bSetHor, sal_Bool } const SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab)); - OSL_ENSURE(pPage,"Page nicht gefunden"); + OSL_ENSURE(pPage,"Page not found"); if (pPage) { SdrObjListIter aIter( *pPage, IM_FLAT ); @@ -2045,7 +2045,7 @@ ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, sal_Bool bCreate ) void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) { - OSL_ENSURE(!pGlobalDrawPersist,"SetGlobalDrawPersist mehrfach"); + OSL_ENSURE(!pGlobalDrawPersist,"Multiple SetGlobalDrawPersist"); pGlobalDrawPersist = pPersist; } diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index b43dd9908587..f0d4cb4a302e 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -150,7 +150,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX SCTAB nTab, double nScaleX, double nScaleY, bool bPageMode, bool bFormulaMode, const ScMarkData* pMarkData ) { - OSL_ENSURE( maTabs[nTab], "Tabelle existiert nicht" ); + OSL_ENSURE( maTabs[nTab], "Table does not exist" ); bool bLayoutRTL = IsLayoutRTL( nTab ); @@ -245,7 +245,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX ++nArrY; if (nArrY >= ROWINFO_MAX) { - OSL_FAIL("Zu grosser Bereich bei FillInfo" ); + OSL_FAIL("FillInfo: Range too big" ); nYExtra = nSignedY; // Ende nY2 = nYExtra - 1; // Bereich anpassen } @@ -274,7 +274,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX { //! Conditionals auch bei HASATTR_ROTATE abfragen ???? - OSL_ENSURE( nArrCount>2, "nArrCount zu klein" ); + OSL_ENSURE( nArrCount>2, "nArrCount too small" ); // FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-2, nX1, nX2 ); FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-1, nX1, nX2 ); // FindMaxRotCol setzt nRotMaxCol @@ -392,7 +392,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX { while ( pRowInfo[nArrY].nRowNo < nThisRow ) ++nArrY; - OSL_ENSURE( pRowInfo[nArrY].nRowNo == nThisRow, "Zeile nicht gefunden in FillInfo" ); + OSL_ENSURE( pRowInfo[nArrY].nRowNo == nThisRow, "FillInfo: Row not found" ); RowInfo* pThisRowInfo = &pRowInfo[nArrY]; CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX]; @@ -901,7 +901,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX break; default: - OSL_FAIL("falscher Shadow-Enum"); + OSL_FAIL("wrong Shadow-Enum"); } } } diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 4ece942f607c..5facf9f16b70 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -740,7 +740,7 @@ const ScFuncDesc* ScFunctionMgr::Get( sal_uInt16 nFIndex ) const const ScFuncDesc* ScFunctionMgr::First( sal_uInt16 nCategory ) const { - OSL_ENSURE( nCategory < MAX_FUNCCAT, "Unbekannte Kategorie" ); + OSL_ENSURE( nCategory < MAX_FUNCCAT, "Unknown category" ); const ScFuncDesc* pDesc = NULL; if ( nCategory < MAX_FUNCCAT ) { diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 1a199c7b343b..c4fb19fb3b39 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -601,14 +601,14 @@ void ScGlobal::InitTextHeight(SfxItemPool* pPool) { if (!pPool) { - OSL_FAIL("kein Pool bei ScGlobal::InitTextHeight"); + OSL_FAIL("ScGlobal::InitTextHeight: No Pool"); return; } const ScPatternAttr* pPattern = (const ScPatternAttr*)&pPool->GetDefaultItem(ATTR_PATTERN); if (!pPattern) { - OSL_FAIL("kein Default-Pattern bei ScGlobal::InitTextHeight"); + OSL_FAIL("ScGlobal::InitTextHeight: No default pattern"); return; } diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index a1fa29546252..c457d4ac26a7 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -333,7 +333,7 @@ SCROW ScMarkArray::GetMarkEnd( SCROW nRow, sal_Bool bUp ) const SCROW nRet; SCSIZE nIndex; Search(nRow, nIndex); - OSL_ENSURE( pData[nIndex].bMarked, "GetMarkEnd ohne bMarked" ); + OSL_ENSURE( pData[nIndex].bMarked, "GetMarkEnd without bMarked" ); if (bUp) { if (nIndex>0) diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index 9cb84ae0248f..0bd54badf8a4 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -201,7 +201,7 @@ SCTAB ScMarkData::GetFirstSelected() const if (maTabMarked.size() > 0) return (*maTabMarked.begin()); - OSL_FAIL("GetFirstSelected: keine markiert"); + OSL_FAIL("GetFirstSelected: nothing selected"); return 0; } @@ -210,7 +210,7 @@ SCTAB ScMarkData::GetLastSelected() const if (maTabMarked.size() > 0) return (*maTabMarked.rbegin()); - OSL_FAIL("GetLastSelected: keine markiert"); + OSL_FAIL("GetLastSelected: nothing selected"); return 0; } @@ -248,7 +248,7 @@ void ScMarkData::MarkToSimple() if ( bMultiMarked ) { - OSL_ENSURE(pMultiSel, "bMultiMarked, aber pMultiSel == 0"); + OSL_ENSURE(pMultiSel, "bMultiMarked, but pMultiSel == 0"); ScRange aNew = aMultiRange; @@ -299,7 +299,7 @@ bool ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, bool bNoSimple ) const { //! hier auf negative Markierung testen ? - OSL_ENSURE(pMultiSel, "bMultiMarked, aber pMultiSel == 0"); + OSL_ENSURE(pMultiSel, "bMultiMarked, but pMultiSel == 0"); return pMultiSel[nCol].GetMark( nRow ); } @@ -334,7 +334,7 @@ bool ScMarkData::IsRowMarked( SCROW nRow ) const if ( bMultiMarked ) { - OSL_ENSURE(pMultiSel, "bMultiMarked, aber pMultiSel == 0"); + OSL_ENSURE(pMultiSel, "bMultiMarked, but pMultiSel == 0"); for (SCCOL nCol=0; nCol<=MAXCOL; nCol++) if (!pMultiSel[nCol].GetMark(nRow)) return false; @@ -382,7 +382,7 @@ void ScMarkData::FillRangeListWithMarks( ScRangeList* pList, bool bClear ) const if ( bMultiMarked ) { - OSL_ENSURE(pMultiSel, "bMultiMarked, aber pMultiSel == 0"); + OSL_ENSURE(pMultiSel, "bMultiMarked, but pMultiSel == 0"); SCTAB nTab = aMultiRange.aStart.Tab(); @@ -545,7 +545,7 @@ bool ScMarkData::IsAllMarked( const ScRange& rRange ) const if ( !bMultiMarked ) return false; - OSL_ENSURE(pMultiSel, "bMultiMarked, aber pMultiSel == 0"); + OSL_ENSURE(pMultiSel, "bMultiMarked, but pMultiSel == 0"); SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row(); @@ -564,7 +564,7 @@ SCsROW ScMarkData::GetNextMarked( SCCOL nCol, SCsROW nRow, bool bUp ) const if ( !bMultiMarked ) return nRow; - OSL_ENSURE(pMultiSel, "bMultiMarked, aber pMultiSel == 0"); + OSL_ENSURE(pMultiSel, "bMultiMarked, but pMultiSel == 0"); return pMultiSel[nCol].GetNextMarked( nRow, bUp ); } @@ -574,7 +574,7 @@ bool ScMarkData::HasMultiMarks( SCCOL nCol ) const if ( !bMultiMarked ) return false; - OSL_ENSURE(pMultiSel, "bMultiMarked, aber pMultiSel == 0"); + OSL_ENSURE(pMultiSel, "bMultiMarked, but pMultiSel == 0"); return pMultiSel[nCol].HasMarks(); } @@ -584,7 +584,7 @@ bool ScMarkData::HasAnyMultiMarks() const if ( !bMultiMarked ) return false; - OSL_ENSURE(pMultiSel, "bMultiMarked, aber pMultiSel == 0"); + OSL_ENSURE(pMultiSel, "bMultiMarked, but pMultiSel == 0"); for (SCCOL nCol=0; nCol<=MAXCOL; nCol++) if ( pMultiSel[nCol].HasMarks() ) diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index d81228e430da..eb6461bb85bc 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -910,7 +910,7 @@ size_t ScSubOutlineIterator::LastEntry() const { if (nSubEntry == 0) { - OSL_FAIL("ScSubOutlineIterator::LastEntry vor GetNext"); + OSL_FAIL("ScSubOutlineIterator::LastEntry before GetNext"); return 0; } return nSubEntry-1; @@ -920,12 +920,12 @@ void ScSubOutlineIterator::DeleteLast() { if (nSubLevel >= nDepth) { - OSL_FAIL("ScSubOutlineIterator::DeleteLast nach Ende"); + OSL_FAIL("ScSubOutlineIterator::DeleteLast after End"); return; } if (nSubEntry == 0) { - OSL_FAIL("ScSubOutlineIterator::DeleteLast vor GetNext"); + OSL_FAIL("ScSubOutlineIterator::DeleteLast before GetNext"); return; } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index c6a760080764..a391ad136831 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -360,7 +360,7 @@ void ScPatternAttr::GetFont( eLang = ((const SvxLanguageItem&)rItemSet.Get( nLangId )).GetLanguage(); } - OSL_ENSURE(pFontAttr,"nanu?"); + OSL_ENSURE(pFontAttr,"Oops?"); // auswerten @@ -1220,7 +1220,7 @@ sal_uLong ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const sal_uLong ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter, const SfxItemSet* pCondSet ) const { - OSL_ENSURE(pFormatter,"GetNumberFormat ohne Formatter"); + OSL_ENSURE(pFormatter,"GetNumberFormat without Formatter"); const SfxPoolItem* pFormItem; if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,true,&pFormItem) != SFX_ITEM_SET ) diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 38d705c9100d..fd5026f22593 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -453,7 +453,7 @@ bool ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nExtr const Fraction& rZoomX, const Fraction& rZoomY, bool bForce, ScProgress* pOuterProgress, sal_uLong nProgressStart ) { - OSL_ENSURE( nExtra==0 || bForce, "autom. OptimalHeight mit Extra" ); + OSL_ENSURE( nExtra==0 || bForce, "automatic OptimalHeight with Extra" ); if ( !pDocument->IsAdjustHeightEnabled() ) { @@ -486,7 +486,7 @@ void ScTable::SetOptimalHeightOnly( SCROW nStartRow, SCROW nEndRow, sal_uInt16 n const Fraction& rZoomX, const Fraction& rZoomY, bool bForce, ScProgress* pOuterProgress, sal_uLong nProgressStart ) { - OSL_ENSURE( nExtra==0 || bForce, "autom. OptimalHeight mit Extra" ); + OSL_ENSURE( nExtra==0 || bForce, "automatic OptimalHeight with Extra" ); if ( !pDocument->IsAdjustHeightEnabled() ) return; @@ -1369,7 +1369,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, bool ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark ) const { const ScMarkArray* pMarkArray = rMark.GetArray(); - OSL_ENSURE(pMarkArray,"GetNextMarkedCell ohne MarkArray"); + OSL_ENSURE(pMarkArray,"GetNextMarkedCell without MarkArray"); if ( !pMarkArray ) return false; @@ -1666,7 +1666,7 @@ void ScTable::ExtendPrintArea( OutputDevice* pDev, { if ( !pColFlags || !pRowFlags ) { - OSL_FAIL("keine ColInfo oder RowInfo in ExtendPrintArea"); + OSL_FAIL("ExtendPrintArea: No ColInfo or RowInfo"); return; } diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 9acc67782301..c0815c0f12aa 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -1401,7 +1401,7 @@ ScBaseCell* ScTable::GetCell( SCCOL nCol, SCROW nRow ) const if (ValidColRow( nCol, nRow )) return aCol[nCol].GetCell( nRow ); - OSL_FAIL("GetCell ausserhalb"); + OSL_FAIL("GetCell: out of range"); return NULL; } @@ -1749,7 +1749,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO SCCOL nTouchedCol = nCol; long nWidth = static_cast<long>(mpRowHeights->getValue(nRow) * nFactor); - OSL_ENSURE(nWidth <= 0, "Richtung falsch"); + OSL_ENSURE(nWidth <= 0, "Wrong direction"); while ( nWidth < 0 && nTouchedCol > 0 ) { --nTouchedCol; @@ -1778,7 +1778,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC { if ( !pColWidth || !mpRowHeights || !pColFlags || !pRowFlags ) { - OSL_FAIL( "Spalten-/Zeileninfo fehlt" ); + OSL_FAIL( "Row/column info missing" ); return; } @@ -2108,7 +2108,7 @@ void ScTable::UnlockTable() --nLockCount; else { - OSL_FAIL("UnlockTable ohne LockTable"); + OSL_FAIL("UnlockTable without LockTable"); } } @@ -2450,7 +2450,7 @@ void ScTable::SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth ) } else { - OSL_FAIL("Falsche Spaltennummer oder keine Breiten"); + OSL_FAIL("Invalid column number or no widths"); } } @@ -2472,7 +2472,7 @@ void ScTable::SetRowHeight( SCROW nRow, sal_uInt16 nNewHeight ) { if (!nNewHeight) { - OSL_FAIL("Zeilenhoehe 0 in SetRowHeight"); + OSL_FAIL("SetRowHeight: Row height zero"); nNewHeight = ScGlobal::nStdRowHeight; } @@ -2485,7 +2485,7 @@ void ScTable::SetRowHeight( SCROW nRow, sal_uInt16 nNewHeight ) } else { - OSL_FAIL("Falsche Zeilennummer oder keine Hoehen"); + OSL_FAIL("Invalid row number or no heights"); } } @@ -2531,7 +2531,7 @@ bool ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNew { if (!nNewHeight) { - OSL_FAIL("Zeilenhoehe 0 in SetRowHeight"); + OSL_FAIL("SetRowHeight: Row height zero"); nNewHeight = ScGlobal::nStdRowHeight; } @@ -2579,7 +2579,7 @@ bool ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNew } else { - OSL_FAIL("Falsche Zeilennummer oder keine Hoehen"); + OSL_FAIL("Invalid row number or no heights"); } return bChanged; @@ -2607,14 +2607,14 @@ void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, bool bManual ) } else { - OSL_FAIL("Falsche Zeilennummer oder keine Zeilenflags"); + OSL_FAIL("Invalid row number or no column flags"); } } sal_uInt16 ScTable::GetColWidth( SCCOL nCol, bool bHiddenAsZero ) const { - OSL_ENSURE(ValidCol(nCol),"Falsche Spaltennummer"); + OSL_ENSURE(ValidCol(nCol),"wrong column number"); if (ValidCol(nCol) && pColFlags && pColWidth) { @@ -2630,7 +2630,7 @@ sal_uInt16 ScTable::GetColWidth( SCCOL nCol, bool bHiddenAsZero ) const sal_uInt16 ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingestellte { - OSL_ENSURE(ValidCol(nCol),"Falsche Spaltennummer"); + OSL_ENSURE(ValidCol(nCol),"wrong column number"); if (ValidCol(nCol) && pColWidth) return pColWidth[nCol]; @@ -2731,7 +2731,7 @@ sal_uInt16 ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, sal_uLong ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZero ) const { - OSL_ENSURE(ValidRow(nStartRow) && ValidRow(nEndRow),"Falsche Zeilennummer"); + OSL_ENSURE(ValidRow(nStartRow) && ValidRow(nEndRow),"wrong row number"); if (ValidRow(nStartRow) && ValidRow(nEndRow) && mpRowHeights) { @@ -2757,7 +2757,7 @@ sal_uLong ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZ sal_uLong ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const { - OSL_ENSURE(ValidRow(nStartRow) && ValidRow(nEndRow),"Falsche Zeilennummer"); + OSL_ENSURE(ValidRow(nStartRow) && ValidRow(nEndRow),"wrong row number"); if (ValidRow(nStartRow) && ValidRow(nEndRow) && mpRowHeights) { @@ -2841,7 +2841,7 @@ void ScTable::ShowCol(SCCOL nCol, bool bShow) } else { - OSL_FAIL("Falsche Spaltennummer oder keine Flags"); + OSL_FAIL("Invalid column number or no flags"); } } @@ -2865,7 +2865,7 @@ void ScTable::ShowRow(SCROW nRow, bool bShow) } else { - OSL_FAIL("Falsche Zeilennummer oder keine Flags"); + OSL_FAIL("Invalid row number or no flags"); } } @@ -2892,7 +2892,7 @@ void ScTable::DBShowRow(SCROW nRow, bool bShow) } else { - OSL_FAIL("Falsche Zeilennummer oder keine Flags"); + OSL_FAIL("Invalid row number or no flags"); } } @@ -2999,7 +2999,7 @@ void ScTable::SetRowFlags( SCROW nRow, sal_uInt8 nNewFlags ) pRowFlags->SetValue( nRow, nNewFlags); else { - OSL_FAIL("Falsche Zeilennummer oder keine Flags"); + OSL_FAIL("Invalid row number or no flags"); } } @@ -3010,7 +3010,7 @@ void ScTable::SetRowFlags( SCROW nStartRow, SCROW nEndRow, sal_uInt8 nNewFlags ) pRowFlags->SetValue( nStartRow, nEndRow, nNewFlags); else { - OSL_FAIL("Falsche Zeilennummer(n) oder keine Flags"); + OSL_FAIL("Invalid row number(s) or no flags"); } } @@ -3409,7 +3409,7 @@ sal_uLong ScTable::GetRowOffset( SCROW nRow, bool bHiddenAsZero ) const } else { - OSL_FAIL("GetRowOffset: Daten fehlen"); + OSL_FAIL("GetRowOffset: Data missing"); } return n; } @@ -3453,7 +3453,7 @@ sal_uLong ScTable::GetColOffset( SCCOL nCol, bool bHiddenAsZero ) const } else { - OSL_FAIL("GetColumnOffset: Daten fehlen"); + OSL_FAIL("GetColumnOffset: Data missing"); } return n; } diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 33d3cb516654..f8e4413d7d15 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -1724,7 +1724,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam ) } else { - OSL_FAIL( "TopTenQuery: pCell kein ValueData" ); + OSL_FAIL( "TopTenQuery: pCell no ValueData" ); rEntry.eOp = SC_GREATER_EQUAL; rItem.mfVal = 0; } @@ -1982,7 +1982,7 @@ bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow if ( nVisible > SCSIZE_MAX / sizeof(void*) ) { - OSL_FAIL("zu viele Filterkritierien"); + OSL_FAIL("too many filter criteria"); nVisible = 0; } diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index f7e7c43f85bb..72a018b9a0df 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -178,7 +178,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, double& rInc, sal_uInt16& rMinDigits, ScUserListData*& rListData, sal_uInt16& rListIndex) { - OSL_ENSURE( nCol1==nCol2 || nRow1==nRow2, "FillAnalyse: falscher Bereich" ); + OSL_ENSURE( nCol1==nCol2 || nRow1==nRow2, "FillAnalyse: invalid range" ); rInc = 0.0; rMinDigits = 0; @@ -450,17 +450,17 @@ void ScTable::FillFormula(sal_uLong& /* nFormulaCounter */, bool /* bFirst */, S } else { - OSL_FAIL( "FillFormula: MatrixOrigin keine Formelzelle mit MM_FORMULA" ); + OSL_FAIL( "FillFormula: MatrixOrigin no forumla cell with MM_FORMULA" ); } } else { - OSL_FAIL( "FillFormula: MatrixOrigin rechts unten" ); + OSL_FAIL( "FillFormula: MatrixOrigin bottom right" ); } } else { - OSL_FAIL( "FillFormula: kein MatrixOrigin" ); + OSL_FAIL( "FillFormula: no MatrixOrigin" ); } } pDocument->SetNoListening( false ); @@ -1172,7 +1172,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n } else { - OSL_FAIL("GetAutoFillPreview: falscher Modus"); + OSL_FAIL("GetAutoFillPreview: invalid mode"); } } diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index 474cc19aa34f..644b1a65df66 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -74,7 +74,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) Find( aPageStyle, SFX_STYLE_FAMILY_PAGE ); if ( !pStyle ) { - OSL_FAIL("UpdatePageBreaks: Style nicht gefunden"); + OSL_FAIL("UpdatePageBreaks: Style not found"); return; } SfxItemSet* pStyleSet = &pStyle->GetItemSet(); @@ -126,7 +126,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) if ( pStyleSet->GetItemState( ATTR_PAGE_SCALETOPAGES, false, &pItem ) == SFX_ITEM_SET ) { - OSL_ENSURE( pItem->ISA(SfxUInt16Item), "falsches Item" ); + OSL_ENSURE( pItem->ISA(SfxUInt16Item), "invalid Item" ); bSkipColBreaks = bSkipRowBreaks = ( ((const SfxUInt16Item*)pItem)->GetValue() > 0 ); } diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index 4d34bb3386a5..d4226fd01f2e 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -45,7 +45,7 @@ IMPL_LINK_INLINE_START( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFac pObjFactory->pNewData = new ScMacroInfo; else { - OSL_FAIL("MakeUserData: falsche ID"); + OSL_FAIL("MakeUserData: wrong ID"); } } return 0; diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 624c37acf81e..5b7471681fbb 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -515,7 +515,7 @@ sal_Bool ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos break; default: - OSL_FAIL("hammanochnich"); + OSL_FAIL("not yet done"); break; } @@ -904,7 +904,7 @@ ScValidationData* ScValidationDataList::GetData( sal_uInt32 nKey ) if( (*it)->GetKey() == nKey ) return *it; - OSL_FAIL("ScValidationDataList: Eintrag nicht gefunden"); + OSL_FAIL("ScValidationDataList: Entry not found"); return NULL; } diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx index fc26cf47c416..5a8af9bc9234 100644 --- a/sc/source/core/tool/adiasync.cxx +++ b/sc/source/core/tool/adiasync.cxx @@ -118,7 +118,7 @@ void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData ) p->pStr = new String( (sal_Char*)pData, osl_getThreadTextEncoding() ); break; default : - OSL_FAIL( "unbekannter AsyncType" ); + OSL_FAIL( "unknown AsyncType" ); return; } p->bValid = sal_True; diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 8ff595ed4d7b..d3e036e63d76 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -1043,7 +1043,7 @@ bool ScAutoFormat::Load() rStream >> nCnt >> nChrSet; if( rStream.Tell() != sal_uLong(nPos + nCnt) ) { - OSL_FAIL( "Der Header enthaelt mehr/neuere Daten" ); + OSL_FAIL( "header contains more/newer data" ); rStream.Seek( nPos + nCnt ); } rStream.SetStreamCharSet( GetSOLoadTextEncoding( nChrSet ) ); diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index ed05ee185780..494688491eb4 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -4335,7 +4335,7 @@ bool ScChangeTrack::Reject( { if ( pAct->HasDependent() && !bRecursion ) { - OSL_ENSURE( pMap, "ScChangeTrack::Reject: Insert ohne map" ); + OSL_ENSURE( pMap, "ScChangeTrack::Reject: Insert without map" ); ScChangeActionMap::reverse_iterator itChangeAction; for (itChangeAction = pMap->rbegin(); itChangeAction != pMap->rend() && bOk; ++itChangeAction) @@ -4358,7 +4358,7 @@ bool ScChangeTrack::Reject( } else if ( pAct->IsDeleteType() ) { - OSL_ENSURE( !pMap, "ScChangeTrack::Reject: Delete mit map" ); + OSL_ENSURE( !pMap, "ScChangeTrack::Reject: Delete with map" ); ScBigRange aDelRange; sal_uLong nRejectAction = pAct->GetActionNumber(); bool bTabDel, bTabDelOk; @@ -4454,7 +4454,7 @@ bool ScChangeTrack::Reject( { if ( pAct->HasDependent() && !bRecursion ) { - OSL_ENSURE( pMap, "ScChangeTrack::Reject: Move ohne Map" ); + OSL_ENSURE( pMap, "ScChangeTrack::Reject: Move without Map" ); ScChangeActionMap::reverse_iterator itChangeAction; for( itChangeAction = pMap->rbegin(); itChangeAction != pMap->rend() && bOk; ++itChangeAction ) diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx index c8a6384f0891..dfbf791b0b15 100644 --- a/sc/source/core/tool/consoli.cxx +++ b/sc/source/core/tool/consoli.cxx @@ -476,7 +476,7 @@ static double lcl_CalcData( ScSubTotalFunc eFunc, break; default: { - OSL_FAIL("unbekannte Funktion bei Consoli::CalcData"); + OSL_FAIL("Consoli::CalcData: unknown function"); fCount = -MAXDOUBLE; } break; @@ -491,12 +491,12 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab, PutInOrder(nRow1,nRow2); if ( nCol2 >= sal::static_int_cast<SCCOL>(nCol1 + nColCount) && !bColByName ) { - OSL_FAIL("Bereich zu gross"); + OSL_FAIL("range too big"); nCol2 = sal::static_int_cast<SCCOL>( nCol1 + nColCount - 1 ); } if ( nRow2 >= sal::static_int_cast<SCROW>(nRow1 + nRowCount) && !bRowByName ) { - OSL_FAIL("Bereich zu gross"); + OSL_FAIL("range too big"); nRow2 = sal::static_int_cast<SCROW>( nRow1 + nRowCount - 1 ); } @@ -545,7 +545,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab, nPos = static_cast<SCCOL>(i); bFound = sal_True; } - OSL_ENSURE(bFound, "Spalte nicht gefunden"); + OSL_ENSURE(bFound, "column not found"); } pDestCols[nCol-nStartCol] = nPos; } @@ -566,7 +566,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab, nPos = static_cast<SCROW>(i); bFound = sal_True; } - OSL_ENSURE(bFound, "Zeile nicht gefunden"); + OSL_ENSURE(bFound, "row not found"); } pDestRows[nRow-nStartRow] = nPos; } diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index d713956ec5f7..612ffbd22dbb 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -1304,7 +1304,7 @@ sal_Bool ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat ) bDoThis = !bCaption && !bCircle; // don't include circles else { - OSL_FAIL("wat?"); + OSL_FAIL("what?"); } } if ( bDoThis ) diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 6cdb8dba325f..522853d74320 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -164,7 +164,7 @@ bool lcl_createExcelQuery( SCSIZE nVisible = pQueryRef->getVisibleDataCellCount(); if ( nVisible > SCSIZE_MAX / sizeof(void*) ) { - OSL_FAIL("zu viele Filterkritierien"); + OSL_FAIL("too many filter criteria"); nVisible = 0; } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index aeb048fc6a55..66ba2fc4b980 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -562,7 +562,7 @@ void ScTabEditEngine::Init( const ScPatternAttr& rPattern ) static String lcl_GetCharStr( sal_Int32 nNo ) { - OSL_ENSURE( nNo, "0 ist eine ungueltige Nummer !!" ); + OSL_ENSURE( nNo, "0 is an invalid number !!" ); String aStr; const sal_Int32 coDiff = 'Z' - 'A' +1; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 30e845fd3797..34e4d2bcc6cd 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3215,7 +3215,7 @@ void ScInterpreter::ScMacro() SbModule* pModule = pMethod->GetModule(); bool bUseVBAObjects = pModule->IsVBACompat(); SbxObject* pObject = pModule->GetParent(); - OSL_ENSURE(pObject->IsA(TYPE(StarBASIC)), "Kein Basic gefunden!"); + OSL_ENSURE(pObject->IsA(TYPE(StarBASIC)), "No Basic found!"); String aMacroStr = pObject->GetName(); aMacroStr += '.'; aMacroStr += pModule->GetName(); @@ -3800,7 +3800,7 @@ const ScCalcConfig& ScInterpreter::GetGlobalConfig() void ScInterpreter::GlobalExit() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GlobalExit" ); - OSL_ENSURE(!bGlobalStackInUse, "wer benutzt noch den TokenStack?"); + OSL_ENSURE(!bGlobalStackInUse, "who is still using the TokenStack?"); DELETEZ(pGlobalStack); } diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx index 7db4f90ac098..31588fe9797b 100644 --- a/sc/source/core/tool/prnsave.cxx +++ b/sc/source/core/tool/prnsave.cxx @@ -90,13 +90,13 @@ ScPrintRangeSaver::~ScPrintRangeSaver() ScPrintSaverTab& ScPrintRangeSaver::GetTabData(SCTAB nTab) { - OSL_ENSURE(nTab<nTabCount,"ScPrintRangeSaver Tab zu gross"); + OSL_ENSURE(nTab<nTabCount,"ScPrintRangeSaver Tab too big"); return pData[nTab]; } const ScPrintSaverTab& ScPrintRangeSaver::GetTabData(SCTAB nTab) const { - OSL_ENSURE(nTab<nTabCount,"ScPrintRangeSaver Tab zu gross"); + OSL_ENSURE(nTab<nTabCount,"ScPrintRangeSaver Tab too big"); return pData[nTab]; } diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 105c0d6cec16..ecd4a8ea6f3a 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -201,7 +201,7 @@ void ScRangeData::GuessPosition() // set a position that allows "absoluting" of all relative references // in CalcAbsIfRel without errors - OSL_ENSURE(aPos == ScAddress(), "die Position geht jetzt verloren"); + OSL_ENSURE(aPos == ScAddress(), "position will go lost now"); SCsCOL nMinCol = 0; SCsROW nMinRow = 0; diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index a6d5af248da2..81772985535c 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -98,7 +98,7 @@ sal_Bool ScRangeUtil::IsAbsTabArea( const String& rAreaStr, sal_Bool /* bAcceptCellRef */, ScAddress::Details const & rDetails ) const { - OSL_ENSURE( pDoc, "Kein Dokument uebergeben!" ); + OSL_ENSURE( pDoc, "No document given!" ); if ( !pDoc ) return false; diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx index 813bc3e02cc2..7ec8f2b3c7ac 100644 --- a/sc/source/core/tool/rechead.cxx +++ b/sc/source/core/tool/rechead.cxx @@ -38,7 +38,7 @@ ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) : rStream >> nID; if (nID != SCID_SIZES) { - OSL_FAIL("SCID_SIZES nicht gefunden"); + OSL_FAIL("SCID_SIZES not found"); if ( rStream.GetError() == SVSTREAM_OK ) rStream.SetError( SVSTREAM_FILEFORMAT_ERROR ); @@ -63,7 +63,7 @@ ScMultipleReadHeader::~ScMultipleReadHeader() { if ( pMemStream && pMemStream->Tell() != pMemStream->GetEndOfData() ) { - OSL_FAIL( "Sizes nicht vollstaendig gelesen" ); + OSL_FAIL( "Sizes not fully read" ); if ( rStream.GetError() == SVSTREAM_OK ) rStream.SetError( SCWARN_IMPORT_INFOLOST ); } @@ -76,7 +76,7 @@ ScMultipleReadHeader::~ScMultipleReadHeader() void ScMultipleReadHeader::EndEntry() { sal_uLong nPos = rStream.Tell(); - OSL_ENSURE( nPos <= nEntryEnd, "zuviel gelesen" ); + OSL_ENSURE( nPos <= nEntryEnd, "read too much" ); if ( nPos != nEntryEnd ) { if ( rStream.GetError() == SVSTREAM_OK ) @@ -94,7 +94,7 @@ void ScMultipleReadHeader::StartEntry() (*pMemStream) >> nEntrySize; nEntryEnd = nPos + nEntrySize; - OSL_ENSURE( nEntryEnd <= nTotalEnd, "zuviele Eintraege gelesen" ); + OSL_ENSURE( nEntryEnd <= nTotalEnd, "read too many entries" ); } sal_uLong ScMultipleReadHeader::BytesLeft() const @@ -103,7 +103,7 @@ sal_uLong ScMultipleReadHeader::BytesLeft() const if (nReadEnd <= nEntryEnd) return nEntryEnd-nReadEnd; - OSL_FAIL("Fehler bei ScMultipleReadHeader::BytesLeft"); + OSL_FAIL("ScMultipleReadHeader::BytesLeft: Error"); return 0; } diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx index 356d8c082b4b..454176855e90 100644 --- a/sc/source/core/tool/refupdat.cxx +++ b/sc/source/core/tool/refupdat.cxx @@ -360,7 +360,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo else if (eUpdateRefMode == URM_REORDER) { // bisher nur fuer nDz (MoveTab) - OSL_ENSURE ( !nDx && !nDy, "URM_REORDER fuer x und y noch nicht implementiert" ); + OSL_ENSURE ( !nDx && !nDy, "URM_REORDER for x and y not yet implemented" ); if ( nDz && (theCol1 >= nCol1) && (theCol2 <= nCol2) && (theRow1 >= nRow1) && (theRow2 <= nRow2) ) diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 2ffc0f661f7a..6c75a59b4ebd 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -78,7 +78,7 @@ void ScNumFormatAbbrev::PutFormatIndex(sal_uLong nFormat, } else { - OSL_FAIL("SCNumFormatAbbrev:: unbekanntes Zahlformat"); + OSL_FAIL("SCNumFormatAbbrev:: unknown number format"); eLnge = LANGUAGE_SYSTEM; eSysLnge = LANGUAGE_GERMAN; // sonst passt "Standard" nicht sFormatstring.AssignAscii( RTL_CONSTASCII_STRINGPARAM( pStandardName ) ); diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index 1d9c1938b756..2bca320716cb 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -50,9 +50,9 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* p FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, const ScRange&rRange, const CharSet eCharSet, sal_uInt32 nDifOption ) { - OSL_ENSURE( rRange.aStart <= rRange.aEnd, "*ScExportDif(): Range unsortiert!" ); + OSL_ENSURE( rRange.aStart <= rRange.aEnd, "*ScExportDif(): Range not sorted!" ); OSL_ENSURE( rRange.aStart.Tab() == rRange.aEnd.Tab(), - "ScExportDif(): nur eine Tabelle bidde!" ); + "ScExportDif(): only one table please!" ); const CharSet eStreamCharSet = rOut.GetStreamCharSet(); if ( eStreamCharSet != eCharSet ) @@ -109,7 +109,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc aPrgrsBar.SetState( 0 ); // TABLE - OSL_ENSURE( pDoc->HasTable( nTab ), "*ScExportDif(): Tabelle nicht vorhanden!" ); + OSL_ENSURE( pDoc->HasTable( nTab ), "*ScExportDif(): Table not existent!" ); aOS.append(pKeyTABLE); aOS.appendAscii("\n0,1\n\""); diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index b4f45088bd51..a6864c711d9a 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -828,11 +828,11 @@ DifColumn::DifColumn () void DifColumn::SetLogical( SCROW nRow ) { - OSL_ENSURE( ValidRow(nRow), "*DifColumn::SetLogical(): Row zu gross!" ); + OSL_ENSURE( ValidRow(nRow), "*DifColumn::SetLogical(): Row too big!" ); if( pAkt ) { - OSL_ENSURE( nRow > 0, "*DifColumn::SetLogical(): weitere koennen nicht 0 sein!" ); + OSL_ENSURE( nRow > 0, "*DifColumn::SetLogical(): more cannot be zero!" ); nRow--; @@ -853,16 +853,16 @@ void DifColumn::SetLogical( SCROW nRow ) void DifColumn::SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat ) { - OSL_ENSURE( ValidRow(nRow), "*DifColumn::SetNumFormat(): Row zu gross!" ); + OSL_ENSURE( ValidRow(nRow), "*DifColumn::SetNumFormat(): Row too big!" ); if( nNumFormat > 0 ) { if(pAkt) { OSL_ENSURE( nRow > 0, - "*DifColumn::SetNumFormat(): weitere koennen nicht 0 sein!" ); + "*DifColumn::SetNumFormat(): more cannot be zero!" ); OSL_ENSURE( nRow > pAkt->nEnd, - "*DifColumn::SetNumFormat(): Noch 'mal von vorne?" ); + "*DifColumn::SetNumFormat(): start from scratch?" ); if( pAkt->nNumFormat == nNumFormat && pAkt->nEnd == nRow - 1 ) pAkt->nEnd = nRow; @@ -935,8 +935,8 @@ DifAttrCache::~DifAttrCache() void DifAttrCache::SetLogical( const SCCOL nCol, const SCROW nRow ) { - OSL_ENSURE( ValidCol(nCol), "-DifAttrCache::SetLogical(): Col zu gross!" ); - OSL_ENSURE( bPlain, "*DifAttrCache::SetLogical(): muss Plain sein!" ); + OSL_ENSURE( ValidCol(nCol), "-DifAttrCache::SetLogical(): Col too big!" ); + OSL_ENSURE( bPlain, "*DifAttrCache::SetLogical(): has to be Plain!" ); if( !ppCols[ nCol ] ) ppCols[ nCol ] = new DifColumn; @@ -946,8 +946,8 @@ void DifAttrCache::SetLogical( const SCCOL nCol, const SCROW nRow ) void DifAttrCache::SetNumFormat( const SCCOL nCol, const SCROW nRow, const sal_uInt32 nNumFormat ) { - OSL_ENSURE( ValidCol(nCol), "-DifAttrCache::SetNumFormat(): Col zu gross!" ); - OSL_ENSURE( !bPlain, "*DifAttrCache::SetNumFormat(): sollte nicht Plain sein!" ); + OSL_ENSURE( ValidCol(nCol), "-DifAttrCache::SetNumFormat(): Col too big!" ); + OSL_ENSURE( !bPlain, "*DifAttrCache::SetNumFormat(): should not be Plain!" ); if( !ppCols[ nCol ] ) ppCols[ nCol ] = new DifColumn; diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 34718089d894..9598d5b651cb 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -161,7 +161,7 @@ ExcTable::~ExcTable() void ExcTable::Add( XclExpRecordBase* pRec ) { - OSL_ENSURE( pRec, "-ExcTable::Add(): pRec ist NULL!" ); + OSL_ENSURE( pRec, "-ExcTable::Add(): pRec is NULL!" ); aRecList.AppendNewRecord( pRec ); } diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index 4d51afb95e4f..478d2ed78521 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -83,7 +83,7 @@ void LotusFontBuffer::Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet ) void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const String& rName ) { - OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetName(): Array zu klein!" ); + OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetName(): Array too small!" ); if( nIndex < nSize ) { register ENTRY* pEntry = pData + nIndex; @@ -97,7 +97,7 @@ void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const String& rName ) void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeight ) { - OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetHeight(): Array zu klein!" ); + OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetHeight(): Array too small!" ); if( nIndex < nSize ) pData[ nIndex ].Height( *( new SvxFontHeightItem( ( sal_uLong ) nHeight * 20, 100, ATTR_FONT_HEIGHT ) ) ); } @@ -105,7 +105,7 @@ void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeig void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType ) { - OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetType(): Array zu klein!" ); + OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetType(): Array too small!" ); if( nIndex < nSize ) { register ENTRY* pEntry = pData + nIndex; diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index 9f5593cfc432..936f41d9a3ff 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -44,7 +44,7 @@ void _ScRangeListTabs::Append( ScSingleRefData a, SCTAB nTab, const bool b ) } else { - OSL_ENSURE( ValidTab(a.nTab), "-_ScRangeListTabs::Append(): Luegen haben kurze Abstuerze!" ); + OSL_ENSURE( ValidTab(a.nTab), "-_ScRangeListTabs::Append(): A lie has no crash!" ); } if( nTab == SCTAB_MAX) @@ -146,7 +146,7 @@ void _ScRangeListTabs::Append( ScComplexRefData a, SCTAB nTab, bool b ) const ScRange* _ScRangeListTabs::First( SCTAB n ) { - OSL_ENSURE( ValidTab(n), "-_ScRangeListTabs::First(): Und tschuessssssss!" ); + OSL_ENSURE( ValidTab(n), "-_ScRangeListTabs::First(): Good bye!" ); TabRangeType::iterator itr = maTabRanges.find(n); if (itr == maTabRanges.end()) diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 8e62e5d3f7da..4125061928c7 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -530,7 +530,7 @@ void ImportExcel::Array25( void ) static_cast<SCROW>(nFirstRow), GetCurrScTab() ) ); pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula); - OSL_ENSURE( pErgebnis, "*ImportExcel::Array25(): ScTokenArray ist NULL!" ); + OSL_ENSURE( pErgebnis, "*ImportExcel::Array25(): ScTokenArray is NULL!" ); ScMarkData aMarkData; aMarkData.SelectOneTable( GetCurrScTab() ); @@ -829,7 +829,7 @@ void ImportExcel::Shrfmla( void ) pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula ); - OSL_ENSURE( pErgebnis, "+ImportExcel::Shrfmla(): ScTokenArray ist NULL!" ); + OSL_ENSURE( pErgebnis, "+ImportExcel::Shrfmla(): ScTokenArray is NULL!" ); pExcRoot->pShrfmlaBuff->Store( ScRange( static_cast<SCCOL>(nFirstCol), static_cast<SCROW>(nFirstRow), GetCurrScTab(), @@ -974,7 +974,7 @@ void ImportExcel::Bof3( void ) maStrm.Ignore( 2 ); maStrm >> nSubType; - OSL_ENSURE( nSubType != 0x0100, "*ImportExcel::Bof3(): Biff3 als Workbook?!" ); + OSL_ENSURE( nSubType != 0x0100, "*ImportExcel::Bof3(): Biff3 as Workbook?!" ); if( nSubType == 0x0100 ) // Book pExcRoot->eDateiTyp = Biff3W; else if( nSubType == 0x0020 ) // Chart @@ -1004,7 +1004,7 @@ void ImportExcel::Array34( void ) static_cast<SCROW>(nFirstRow), GetCurrScTab() ) ); pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula); - OSL_ENSURE( pErgebnis, "+ImportExcel::Array34(): ScTokenArray ist NULL!" ); + OSL_ENSURE( pErgebnis, "+ImportExcel::Array34(): ScTokenArray is NULL!" ); ScMarkData aMarkData; aMarkData.SelectOneTable( GetCurrScTab() ); diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index d1a330be96ff..55a7ae72d1c4 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -107,7 +107,7 @@ void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken ) { String aName( CreateName( rRange.aStart ) ); - OSL_ENSURE( mnCurrIdx <= 0xFFFF, "*ShrfmlaBuffer::Store(): Gleich wird mir schlecht...!" ); + OSL_ENSURE( mnCurrIdx <= 0xFFFF, "*ShrfmlaBuffer::Store(): I'm getting sick...!" ); ScRangeData* pData = new ScRangeData( pExcRoot->pIR->GetDocPtr(), aName, rToken, rRange.aStart, RT_SHARED ); const ScAddress& rMaxPos = pExcRoot->pIR->GetMaxPos(); @@ -216,7 +216,7 @@ sal_Bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScInd sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const { - OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index muss >0 sein!" ); + OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index has to be >0!" ); if (!nExcIndex || nExcIndex > maEntries.size() ) return false; @@ -227,7 +227,7 @@ sal_Bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const sal_Bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, String& rAppl, String& rDoc ) const { - OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index muss >0 sein!" ); + OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index has to be >0!" ); if (!nExcIndex || nExcIndex > maEntries.size() ) return false; diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index a68ddb276f95..694b9dde54db 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -77,7 +77,7 @@ FltError ImportExcel::Read( void ) sal_uInt16 nOpcode; sal_uInt16 nBofLevel = 0; - OSL_ENSURE( &aIn != NULL, "-ImportExcel::Read(): Kein Stream - wie dass?!" ); + OSL_ENSURE( &aIn != NULL, "-ImportExcel::Read(): No Stream - what happend?!" ); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ScfSimpleProgressBar > pProgress( new ScfSimpleProgressBar( @@ -739,7 +739,7 @@ FltError ImportExcel::Read( void ) case Z_Ende: // ----------------------------------- Z_Ende - OSL_FAIL( "*ImportExcel::Read(): Not possible state!" ); break; - default: OSL_FAIL( "-ImportExcel::Read(): Zustand vergessen!" ); + default: OSL_FAIL( "-ImportExcel::Read(): state forgotten!" ); } } diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index e7c74b8a6c08..06c48c8e3c8a 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -259,7 +259,7 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const String& rBaseURL, ScDocument if( pItem ) { aCId = ((const SfxStringItem *)pItem)->GetValue(); - OSL_ENSURE( aCId.Len(), "CID ohne Laenge!" ); + OSL_ENSURE( aCId.Len(), "CID without length!" ); } } } @@ -1345,7 +1345,7 @@ void ScHTMLExport::MakeCIdURL( String& rURL ) return; String aLastName( aURLObj.GetLastName() ); - OSL_ENSURE( aLastName.Len(), "Dateiname ohne Laenge!" ); + OSL_ENSURE( aLastName.Len(), "filename without length!" ); aLastName.ToLowerAscii(); rURL.AssignAscii( "cid:" ); diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index e833a8e4baf7..109675d6e922 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -91,7 +91,7 @@ ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const String& rBaseURL, const ScR } else { - OSL_FAIL("kein StyleSheet?!?"); + OSL_FAIL("no StyleSheet?!?"); aPageSize = pDefaultDev->LogicToPixel( SvxPaperInfo::GetPaperSize( PAPER_A4 ), MapMode( MAP_TWIP ) ); } diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index a0274f99fc29..916f7a2a7ef5 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -993,7 +993,7 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) CloseEntry( pInfo ); if ( !nTableLevel ) { - OSL_FAIL( "Dummbatz-Dok! <TH> oder <TD> ohne vorheriges <TABLE>" ); + OSL_FAIL( "dumbo doc! <TH> or <TD> without previous <TABLE>" ); TableOn( pInfo ); } bInCell = true; @@ -1221,7 +1221,7 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) TableRowOff( pInfo ); // das optionale TableRowOff war nicht if ( !nTableLevel ) { - OSL_FAIL( "Dummbatz-Dok! </TABLE> ohne oeffnendes <TABLE>" ); + OSL_FAIL( "dumbo doc! </TABLE> without opening <TABLE>" ); return ; } if ( --nTableLevel > 0 ) @@ -1428,7 +1428,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) } if (pImage->aURL.isEmpty()) { - OSL_FAIL( "Image: Grafik ohne URL ?!?" ); + OSL_FAIL( "Image: graphic without URL ?!?" ); return ; } diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 906934bbefdf..a8b30890a2a5 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -135,7 +135,7 @@ inline sal_uInt16 NameBuffer::GetLastIndex () const { int size = maHashes.size() + nBase; - OSL_ENSURE( size <= 0xFFFF, "*NameBuffer::GetLastIndex(): Ich hab' die Nase voll!" ); + OSL_ENSURE( size <= 0xFFFF, "*NameBuffer::GetLastIndex(): I'm sick and tired!" ); return static_cast<sal_uInt16>( size ); } diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index ed2c94956e94..7d09818f8a87 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -269,7 +269,7 @@ inline const TokenId TokenStack::Get( void ) inline TokenStack &TokenStack::operator <<( const TokenId nNewId ) {// Element auf Stack - OSL_ENSURE( nPos < nSize, "*TokenStack::<<(): Stackueberlauf" ); + OSL_ENSURE( nPos < nSize, "*TokenStack::<<(): Stack overflow" ); if( nPos < nSize ) { pStack[ nPos ] = nNewId; diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index 7da372925283..2a62ed4cb21b 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -135,14 +135,14 @@ inline const SfxUInt32Item* FormCache::GetAttr( sal_uInt8 nFormat, sal_uInt8 nSt aCompareIdent.SetStamp( nFormat, nSt ); nIndex = aCompareIdent.GetStamp(); - OSL_ENSURE( nIndex < __nSize, "FormCache::GetAttr(): Uuuuuuups... so nicht!" ); + OSL_ENSURE( nIndex < __nSize, "FormCache::GetAttr(): Oups... not this way!" ); if( bValid[ nIndex ] ) pRet = aIdents[ nIndex ].GetAttr(); else { // neues Attribut anlegen pAttr = NewAttr( nFormat, nSt ); - OSL_ENSURE( pAttr, "FormCache::GetAttr(): Nix Speicherus" ); + OSL_ENSURE( pAttr, "FormCache::GetAttr(): Nothing to save" ); aIdents[ nIndex ] = FormIdent( nFormat, nSt, *pAttr ); bValid[ nIndex ] = sal_True; |