diff options
| author | RĂ¼diger Timm <rt@openoffice.org> | 2004-05-05 15:41:28 +0000 |
|---|---|---|
| committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-05-05 15:41:28 +0000 |
| commit | 8902c1e627b6fceaebdd5751bddd75f1ec1ae9d6 (patch) | |
| tree | 945362eb01623733b4aa5adbbee931eb35fc61d9 | |
| parent | #116666# Replaced DBG_ASSERT(0, STRIP) with DBG_BF_ASSERT(0, STRIP) (diff) | |
| download | binfilter-8902c1e627b6fceaebdd5751bddd75f1ec1ae9d6.tar.gz binfilter-8902c1e627b6fceaebdd5751bddd75f1ec1ae9d6.zip | |
#116666# Replaced DBG_ASSERT(0, STRIP) with DBG_BF_ASSERT(0, STRIP)
496 files changed, 3270 insertions, 3270 deletions
diff --git a/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx b/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx index 1bc9feba6..452e5b911 100644 --- a/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx +++ b/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: offmgr_app.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:10 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -484,7 +484,7 @@ typedef long (SAL_CALL *basicide_handle_basic_error)(void*); /*N*/ sal_Int32 nCount = aFontConfig.IsEnabled() ? aFontConfig.SubstitutionCount() : 0; /*N*/ /*N*/ for (sal_Int32 i = 0; i < nCount; i++) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ sal_uInt16 nFlags = 0; //STRIP001 /*?*/ const SubstitutionStruct* pSubs = aFontConfig.GetSubstitution(i); //STRIP001 /*?*/ if(pSubs->bReplaceAlways) @@ -530,7 +530,7 @@ typedef long (SAL_CALL *basicide_handle_basic_error)(void*); // ------------------------------------------------------------------------ /*N*/void OfficeApplication::DrawExec_Impl( SfxRequest &rReq ) -/*N*/{DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/{DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /* //STRIP001 Slots with the following id's are executed in this function //STRIP001 SID_AUTOPILOT @@ -569,7 +569,7 @@ typedef long (SAL_CALL *basicide_handle_basic_error)(void*); // ------------------------------------------------------------------------ /*N*/void OfficeApplication::ModuleState_Impl( SfxItemSet &rSet ) -/*N*/{DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/{DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // f"ur die Statusabfrage darf das Modul NICHT geladen werden //STRIP001 //STRIP001 #if OSL_DEBUG_LEVEL > 1 @@ -612,7 +612,7 @@ typedef long (SAL_CALL *basicide_handle_basic_error)(void*); // ------------------------------------------------------------------------ /*N*/void OfficeApplication::WriterExec_Impl( SfxRequest &rReq ) -/*N*/{DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/{DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /* //STRIP001 Hier werden Executes fuer folgende Slots weitergeleitet //STRIP001 SID_SW_AGENDA_WIZZARD @@ -702,7 +702,7 @@ typedef long (SAL_CALL *basicide_handle_basic_error)(void*); // ------------------------------------------------------------------------ /*N*/ IMPL_LINK( OfficeApplication, GlobalBasicErrorHdl, StarBASIC*, pBasic ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 // get basctl dllname //STRIP001 String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) ); //STRIP001 sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "ofa" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "basctl" ) ) ); diff --git a/binfilter/bf_sc/source/core/data/sc_attarray.cxx b/binfilter/bf_sc/source/core/data/sc_attarray.cxx index 6d86a31d6..68d646574 100644 --- a/binfilter/bf_sc/source/core/data/sc_attarray.cxx +++ b/binfilter/bf_sc/source/core/data/sc_attarray.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_attarray.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hjs $ $Date: 2004-04-15 13:45:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1462,7 +1462,7 @@ namespace binfilter { /*N*/ void ScAttrArray::DeleteAreaSafe(USHORT nStartRow, USHORT nEndRow) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SetPatternAreaSafe( nStartRow, nEndRow, pDocument->GetDefPattern(), TRUE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetPatternAreaSafe( nStartRow, nEndRow, pDocument->GetDefPattern(), TRUE ); /*N*/ } @@ -2153,7 +2153,7 @@ namespace binfilter { /*N*/ void ScAttrArray::DeleteHardAttr(USHORT nStartRow, USHORT nEndRow) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 const ScPatternAttr* pDefPattern = pDocument->GetDefPattern(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const ScPatternAttr* pDefPattern = pDocument->GetDefPattern(); //STRIP001 const ScPatternAttr* pOldPattern; //STRIP001 //STRIP001 short nIndex; diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx index 91a7f6d0a..16bd9202d 100644 --- a/binfilter/bf_sc/source/core/data/sc_cell.cxx +++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_cell.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:25:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -275,7 +275,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ; /*M*/ bDo = TRUE; /*M*/ else /*M*/ { -/*M*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bDo = pArr->IsReplacedSharedFormula(); +/*M*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bDo = pArr->IsReplacedSharedFormula(); //STRIP001 /*M*/ if ( nOnlyNames & SC_LISTENING_NAMES_REL ) //STRIP001 /*M*/ bDo |= (rRef1.IsRelName() || rRef2.IsRelName()); //STRIP001 /*M*/ if ( nOnlyNames & SC_LISTENING_NAMES_ABS ) @@ -383,7 +383,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ; /*?*/ if ( nOnlyNames & SC_LISTENING_NAMES_REL ) /*?*/ bDo |= (rRef1.IsRelName() || rRef2.IsRelName()); /*?*/ if ( nOnlyNames & SC_LISTENING_NAMES_ABS ) -/*?*/ { DBG_ASSERT(0, "STRIP");} //STRIP001 bDo |= t->IsRPNReferenceAbsName(); +/*?*/ { DBG_BF_ASSERT(0, "STRIP");} //STRIP001 bDo |= t->IsRPNReferenceAbsName(); /*?*/ if ( nOnlyNames & SC_LISTENING_EXCEPT ) /*?*/ bDo = !bDo; /*N*/ } @@ -715,7 +715,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ; /*N*/ pCode = rScFormulaCell.pCode->Clone(); /*N*/ /*N*/ if ( nCopyFlags & 0x0001 ) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pCode->ReadjustRelative3DReferences( rScFormulaCell.aPos, aPos ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pCode->ReadjustRelative3DReferences( rScFormulaCell.aPos, aPos ); /*N*/ /*N*/ // evtl. Fehler zuruecksetzen und neu kompilieren /*N*/ // nicht im Clipboard - da muss das Fehlerflag erhalten bleiben @@ -756,7 +756,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ; /*N*/ { /*N*/ if ( !bCompileLater && bClipMode ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pCode->Reset(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pCode->Reset(); //STRIP001 /*?*/ bCompileLater = (pCode->GetNextColRowName() != NULL); /*N*/ } /*N*/ if ( !bCompileLater ) @@ -1049,7 +1049,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ; /*N*/ { /*N*/ if ( !pCode->GetLen() && aErgString.Len() && rFormula == aErgString ) /*N*/ { // #65994# nicht rekursiv CompileTokenArray/Compile/CompileTokenArray -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( rFormula.GetChar(0) == '=' ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( rFormula.GetChar(0) == '=' ) //STRIP001 /*?*/ pCode->AddBad( rFormula.GetBuffer() + 1 ); //STRIP001 /*?*/ else //STRIP001 /*?*/ pCode->AddBad( rFormula.GetBuffer() ); @@ -1131,7 +1131,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ; /*N*/ { /*N*/ if ( !pCode->GetLen() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( aFormula.GetChar(0) == '=' ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( aFormula.GetChar(0) == '=' ) //STRIP001 /*?*/ pCode->AddBad( aFormula.GetBuffer() + 1 ); //STRIP001 /*?*/ else //STRIP001 /*?*/ pCode->AddBad( aFormula.GetBuffer() ); @@ -1486,7 +1486,7 @@ DECLARE_LIST (ScFormulaCellList, ScFormulaCell*)//STRIP008 ; /*N*/ /*N*/ if ( pCode->IsRecalcModeForced() ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ULONG nValidation = ((const SfxUInt32Item*) pDocument->GetAttr( +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ULONG nValidation = ((const SfxUInt32Item*) pDocument->GetAttr( //STRIP001 /*?*/ aPos.Col(), aPos.Row(), aPos.Tab(), ATTR_VALIDDATA ))->GetValue(); //STRIP001 /*?*/ if ( nValidation ) //STRIP001 /*?*/ { @@ -1535,7 +1535,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ULONG nValidation = ((const /*?*/ bForceTrack = !bTableOpDirty; /*?*/ if ( !bTableOpDirty ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDocument->AddTableOpFormulaCell( this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDocument->AddTableOpFormulaCell( this ); //STRIP001 /*?*/ bTableOpDirty = TRUE; /*?*/ } /*N*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx b/binfilter/bf_sc/source/core/data/sc_cell2.cxx index ea791fb42..e6311ec98 100644 --- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx +++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_cell2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 12:42:37 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -660,7 +660,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell); /*N*/ const ScRange& r, /*N*/ short nDx, short nDy, short nDz, /*N*/ ScDocument* pUndoDoc ) -/*N*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 /*N*/ USHORT nCol1 = r.aStart.Col(); //STRIP001 /*N*/ USHORT nRow1 = r.aStart.Row(); //STRIP001 /*N*/ USHORT nTab1 = r.aStart.Tab(); @@ -1074,7 +1074,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell); /*N*/ BOOL ScFormulaCell::TestTabRefAbs(USHORT nTable) /*N*/ { /*N*/ BOOL bRet = FALSE; -DBG_ASSERT(0, "STRIP"); /*N*/ if( !pDocument->IsClipOrUndo() ) +DBG_BF_ASSERT(0, "STRIP"); /*N*/ if( !pDocument->IsClipOrUndo() ) /*N*/ { /*N*/ pCode->Reset(); /*N*/ ScToken* p = pCode->GetNextReferenceRPN(); @@ -1108,7 +1108,7 @@ DBG_ASSERT(0, "STRIP"); /*N*/ if( !pDocument->IsClipOrUndo() ) /*N*/ void ScFormulaCell::UpdateCompile( BOOL bForceIfNameInUse ) /*N*/ { /*N*/ if ( bForceIfNameInUse && !bCompile ) -/*?*/ { DBG_ASSERT(0, "STRIP");} /*N*/ bCompile = pCode->HasNameOrColRowName(); +/*?*/ { DBG_BF_ASSERT(0, "STRIP");} /*N*/ bCompile = pCode->HasNameOrColRowName(); /*N*/ if ( bCompile ) /*?*/ pCode->SetError( 0 ); // damit auch wirklich kompiliert wird /*N*/ CompileTokenArray(); diff --git a/binfilter/bf_sc/source/core/data/sc_column.cxx b/binfilter/bf_sc/source/core/data/sc_column.cxx index 19cb0af41..ef14ad2f7 100644 --- a/binfilter/bf_sc/source/core/data/sc_column.cxx +++ b/binfilter/bf_sc/source/core/data/sc_column.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_column.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -640,7 +640,7 @@ namespace binfilter { void ScColumn::SetPattern( USHORT nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 pAttrArray->SetPattern( nRow, &rPatAttr, bPutToPool ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pAttrArray->SetPattern( nRow, &rPatAttr, bPutToPool ); } @@ -1416,7 +1416,7 @@ void ScColumn::SetPattern( USHORT nRow, const ScPatternAttr& rPatAttr, BOOL bPut /*N*/ ScBaseCell* pNew; /*N*/ if (bAsLink) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pNew = CreateRefCell( rColumn.pDocument, aAdr, i, nFlags ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pNew = CreateRefCell( rColumn.pDocument, aAdr, i, nFlags ); /*N*/ } /*N*/ else /*N*/ { @@ -1669,7 +1669,7 @@ void ScColumn::SetPattern( USHORT nRow, const ScPatternAttr& rPatAttr, BOOL bPut /*N*/ ScAddress( nCol2, nRow2, nTab2 ) ); /*N*/ if ( eUpdateRefMode == URM_COPY && nRow1 == nRow2 ) /*N*/ { // z.B. eine einzelne Zelle aus dem Clipboard eingefuegt -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ USHORT nIndex; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ USHORT nIndex; //STRIP001 /*?*/ if ( Search( nRow1, nIndex ) ) //STRIP001 /*?*/ { //STRIP001 /*?*/ ScFormulaCell* pCell = (ScFormulaCell*) pItems[nIndex].pCell; @@ -1695,7 +1695,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ USHORT nIndex; /*?*/ ScBaseCell* pCell = pItems[i].pCell; /*?*/ if( pCell->GetCellType() == CELLTYPE_FORMULA) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((ScFormulaCell*)pCell)->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz, pUndoDoc ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((ScFormulaCell*)pCell)->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz, pUndoDoc ); //STRIP001 /*?*/ if ( nRow != pItems[i].nRow ) //STRIP001 /*?*/ Search( nRow, i ); // Listener removed/inserted? /*?*/ } @@ -1709,7 +1709,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ USHORT nIndex; /*?*/ ScBaseCell* pCell = pItems[i].pCell; /*?*/ if( pCell->GetCellType() == CELLTYPE_FORMULA) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nRow = pItems[i].nRow; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nRow = pItems[i].nRow; //STRIP001 /*?*/ ((ScFormulaCell*)pCell)->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz, pUndoDoc ); //STRIP001 /*?*/ if ( nRow != pItems[i].nRow ) //STRIP001 /*?*/ Search( nRow, i ); // Listener removed/inserted? diff --git a/binfilter/bf_sc/source/core/data/sc_column2.cxx b/binfilter/bf_sc/source/core/data/sc_column2.cxx index 9601273a6..498e39a68 100644 --- a/binfilter/bf_sc/source/core/data/sc_column2.cxx +++ b/binfilter/bf_sc/source/core/data/sc_column2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_column2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -273,7 +273,7 @@ namespace binfilter { BOOL lcl_RemoveThis( ScDocument* pDocument, USHORT nCol, USHORT nRow, USHORT nTab ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 ScDBCollection* pDBColl = pDocument->GetDBCollection(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDBCollection* pDBColl = pDocument->GetDBCollection(); //STRIP001 if ( pDBColl ) //STRIP001 { //STRIP001 USHORT nCount = pDBColl->GetCount(); @@ -845,7 +845,7 @@ BOOL lcl_RemoveThis( ScDocument* pDocument, USHORT nCol, USHORT nRow, USHORT nTa /*?*/ bAddMargin = FALSE; /*?*/ // nur nach rechts: /*?*/ //! unterscheiden nach Ausrichtung oben/unten (nur Text/ganze Hoehe) -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if ( pPattern->GetRotateDir( pCondSet ) == SC_ROTDIR_RIGHT ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if ( pPattern->GetRotateDir( pCondSet ) == SC_ROTDIR_RIGHT ) //STRIP001 /*?*/ nWidth += (long)( pDocument->GetRowHeight( nRow,nTab ) * //STRIP001 /*?*/ nPPT * nCosAbs / nSinAbs ); /*?*/ } @@ -1006,7 +1006,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if ( pPattern->G /*?*/ nWidth = (long)( aSize.Width() * nCosAbs + aSize.Height() * nSinAbs ); /*?*/ else if ( rOptions.bTotalSize ) /*?*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nWidth = (long) ( pDocument->GetColWidth( nCol,nTab ) * nPPT ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nWidth = (long) ( pDocument->GetColWidth( nCol,nTab ) * nPPT ); //STRIP001 /*?*/ bAddMargin = FALSE; //STRIP001 /*?*/ if ( pPattern->GetRotateDir( pCondSet ) == SC_ROTDIR_RIGHT ) //STRIP001 /*?*/ nWidth += (long)( pDocument->GetRowHeight( nRow,nTab ) * diff --git a/binfilter/bf_sc/source/core/data/sc_column3.cxx b/binfilter/bf_sc/source/core/data/sc_column3.cxx index 4a8326459..d383ecf27 100644 --- a/binfilter/bf_sc/source/core/data/sc_column3.cxx +++ b/binfilter/bf_sc/source/core/data/sc_column3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_column3.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -601,7 +601,7 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx /*N*/ if ( nDelFlag & IDF_EDITATTR ) /*N*/ { /*?*/ DBG_ASSERT( nContFlag == 0, "DeleteArea: falsche Flags" ); -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RemoveEditAttribs( nStartRow, nEndRow ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RemoveEditAttribs( nStartRow, nEndRow ); /*N*/ } /*N*/ /*N*/ // Attribute erst hier @@ -841,7 +841,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RemoveEditAttribs( nStartRow, nE /*?*/ ScFormulaCell* pForm = (ScFormulaCell*)pSource; /*?*/ if (nFlags & IDF_FORMULA) /*?*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pNew = pForm->Clone( pDestDoc, rDestPos, TRUE ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pNew = pForm->Clone( pDestDoc, rDestPos, TRUE ); /*?*/ } /*?*/ else if ( (nFlags & (IDF_VALUE | IDF_DATETIME | IDF_STRING)) && /*?*/ !pDestDoc->IsUndo() ) @@ -857,7 +857,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pNew = pForm->Clone( /*?*/ /*?*/ if ( nFlags & IDF_VALUE ) /*?*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScFormulaCell* pErrCell = new ScFormulaCell( pDestDoc, rDestPos ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScFormulaCell* pErrCell = new ScFormulaCell( pDestDoc, rDestPos ); //STRIP001 /*?*/ pErrCell->SetErrCode( nErr ); //STRIP001 /*?*/ pNew = pErrCell; /*?*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_conditio.cxx b/binfilter/bf_sc/source/core/data/sc_conditio.cxx index c8ff51776..3b0f97aa6 100644 --- a/binfilter/bf_sc/source/core/data/sc_conditio.cxx +++ b/binfilter/bf_sc/source/core/data/sc_conditio.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_conditio.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:25:58 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -948,7 +948,7 @@ namespace binfilter { /*N*/ if (bVal) /*N*/ return IsValid( nArg ); /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 return IsValidStr( aArgStr ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 return IsValidStr( aArgStr ); /*N*/ } /*N*/ String ScConditionEntry::GetExpression( const ScAddress& rCursor, USHORT nIndex, diff --git a/binfilter/bf_sc/source/core/data/sc_dociter.cxx b/binfilter/bf_sc/source/core/data/sc_dociter.cxx index 9bc8bf807..f670d7d5f 100644 --- a/binfilter/bf_sc/source/core/data/sc_dociter.cxx +++ b/binfilter/bf_sc/source/core/data/sc_dociter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_dociter.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -244,7 +244,7 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr, USHORT& nAttrEndRow, const ScAttrArray* pNewArr, USHORT nRow, ScDocument* pDoc ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 if ( rpArr != pNewArr || nAttrEndRow < nRow ) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( rpArr != pNewArr || nAttrEndRow < nRow ) //STRIP001 { //STRIP001 short nPos; //STRIP001 pNewArr->Search( nRow, nPos ); // nPos 0 gueltig wenn nicht gefunden diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx index 89852ce26..6d54eefa5 100644 --- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx +++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_documen2.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: er $ $Date: 2004-03-30 13:21:51 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -458,7 +458,7 @@ namespace binfilter { /*N*/ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT( pTrack->GetDocument() == this, "SetChangeTrack: different documents" ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT( pTrack->GetDocument() == this, "SetChangeTrack: different documents" ); //STRIP001 if ( !pTrack || pTrack == pChangeTrack || pTrack->GetDocument() != this ) //STRIP001 return ; //STRIP001 EndChangeTracking(); @@ -468,7 +468,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT( pTrack->GetDocument() == this, " /*N*/ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, pTimer ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln //STRIP001 { //STRIP001 aTrackTimer.Start(); // spaeter nochmal versuchen //STRIP001 } @@ -655,7 +655,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT( pTrack->GetDocument() == this, " /*N*/ void ScDocument::ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) //STRIP001 { //STRIP001 InitClipPtrs(pSourceDoc); //STRIP001 @@ -675,7 +675,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) /*N*/ void ScDocument::ResetClip( ScDocument* pSourceDoc, USHORT nTab ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) //STRIP001 { //STRIP001 InitClipPtrs(pSourceDoc); //STRIP001 @@ -1710,12 +1710,12 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) /*?*/ for (USHORT j = 0; !bInUse && (j <= MAXTAB); j++) /*?*/ { /*?*/ if (pSrcDoc->pTab[j]) -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ bInUse = pSrcDoc->pTab[j]->IsRangeNameInUse(0, 0, MAXCOL, MAXROW, +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ bInUse = pSrcDoc->pTab[j]->IsRangeNameInUse(0, 0, MAXCOL, MAXROW, //STRIP001 /*?*/ nOldIndex); /*?*/ } /*?*/ if (bInUse) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScRangeData* pData = new ScRangeData( *pSrcData ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScRangeData* pData = new ScRangeData( *pSrcData ); //STRIP001 /*?*/ pData->SetDocument(this); //STRIP001 /*?*/ if ( pRangeName->FindIndex( pData->GetIndex() ) ) //STRIP001 /*?*/ pData->SetIndex(0); // need new index, done in Insert @@ -1748,7 +1748,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ bInUse = pSrcDoc /*N*/ { /*?*/ // first update all inserted named formulas if they contain other /*?*/ // range names and used indices changed -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch //STRIP001 /*?*/ { //STRIP001 /*?*/ if ( pSrcRangeNames[i] ) //STRIP001 /*?*/ pSrcRangeNames[i]->ReplaceRangeNamesInUse( aSrcRangeMap ); @@ -1844,7 +1844,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ for (USHORT i = 0; i < n /*N*/ void ScDocument::SetChangeViewSettings(const ScChangeViewSettings& rNew) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if (pChangeViewSettings==NULL) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pChangeViewSettings==NULL) //STRIP001 pChangeViewSettings = new ScChangeViewSettings; //STRIP001 //STRIP001 DBG_ASSERT( pChangeViewSettings, "Oops. No ChangeViewSettings :-( by!" ); diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx index a7214c574..07064e94f 100644 --- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx +++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_documen3.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -921,7 +921,7 @@ using namespace ::com::sun::star; /*N*/ USHORT nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, /*N*/ double nStepValue, double nMaxValue) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 PutInOrder( nCol1, nCol2 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 PutInOrder( nCol1, nCol2 ); //STRIP001 /*?*/ PutInOrder( nRow1, nRow2 ); //STRIP001 /*?*/ for (USHORT i=0; i <= MAXTAB; i++) //STRIP001 /*?*/ if (pTab[i]) @@ -943,7 +943,7 @@ using namespace ::com::sun::star; /*N*/ void ScDocument::AutoFormat( USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow, /*N*/ USHORT nFormatNo, const ScMarkData& rMark ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 PutInOrder( nStartCol, nEndCol ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 PutInOrder( nStartCol, nEndCol ); //STRIP001 /*?*/ PutInOrder( nStartRow, nEndRow ); //STRIP001 /*?*/ for (USHORT i=0; i <= MAXTAB; i++) //STRIP001 /*?*/ if (pTab[i]) @@ -1167,7 +1167,7 @@ using namespace ::com::sun::star; /*N*/ void ScDocument::Sort(USHORT nTab, const ScSortParam& rSortParam, BOOL bKeepQuery) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( nTab<=MAXTAB && pTab[nTab] ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( nTab<=MAXTAB && pTab[nTab] ) //STRIP001 /*?*/ { //STRIP001 /*?*/ BOOL bOldDisableIdle = IsIdleDisabled(); //STRIP001 /*?*/ DisableIdle( TRUE ); @@ -1178,7 +1178,7 @@ using namespace ::com::sun::star; /*N*/ USHORT ScDocument::Query(USHORT nTab, const ScQueryParam& rQueryParam, BOOL bKeepSub) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( nTab<=MAXTAB && pTab[nTab] ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( nTab<=MAXTAB && pTab[nTab] ) //STRIP001 /*?*/ return pTab[nTab]->Query((ScQueryParam&)rQueryParam, bKeepSub); //STRIP001 /*?*/ //STRIP001 /*?*/ DBG_ERROR("missing tab"); @@ -1250,7 +1250,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocument::HasColHeader( USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow, /*N*/ USHORT nTab ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (VALIDTAB(nTab)) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (VALIDTAB(nTab)) //STRIP001 /*?*/ if (pTab[nTab]) //STRIP001 /*?*/ return pTab[nTab]->HasColHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //STRIP001 /*?*/ @@ -1260,7 +1260,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocument::HasRowHeader( USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow, /*N*/ USHORT nTab ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (VALIDTAB(nTab)) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (VALIDTAB(nTab)) //STRIP001 /*?*/ if (pTab[nTab]) //STRIP001 /*?*/ return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //STRIP001 /*?*/ @@ -1755,7 +1755,7 @@ using namespace ::com::sun::star; /*N*/ void ScDocument::SetExtDocOptions( ScExtDocOptions* pNewOptions ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete pExtDocOptions; +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete pExtDocOptions; //STRIP001 /*N*/ pExtDocOptions = pNewOptions; /*N*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_documen4.cxx b/binfilter/bf_sc/source/core/data/sc_documen4.cxx index 30ea7f568..de2a265d1 100644 --- a/binfilter/bf_sc/source/core/data/sc_documen4.cxx +++ b/binfilter/bf_sc/source/core/data/sc_documen4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_documen4.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:25:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,7 +185,7 @@ namespace binfilter { /*N*/ if (i == nTab1) /*N*/ pTab[i]->PutCell(nCol1, nRow1, pCell); /*N*/ else -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pTab[i]->PutCell(nCol1, nRow1, pCell->Clone(this, ScAddress( nCol1, nRow1, i))); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pTab[i]->PutCell(nCol1, nRow1, pCell->Clone(this, ScAddress( nCol1, nRow1, i))); /*N*/ } /*N*/ } /*N*/ @@ -352,7 +352,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pTab[i]->PutCell(nCol1, /*N*/ void ScDocument::CompileDBFormula() /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i=0; i<=MAXTAB; i++) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i=0; i<=MAXTAB; i++) //STRIP001 /*?*/ { //STRIP001 /*?*/ if (pTab[i]) pTab[i]->CompileDBFormula(); //STRIP001 /*?*/ } @@ -369,7 +369,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pTab[i]->PutCell(nCol1, /*N*/ void ScDocument::CompileNameFormula( BOOL bCreateFormulaString ) /*N*/ { /*N*/ if ( pCondFormList ) -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pCondFormList->CompileAll(); // nach ScNameDlg noetig +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pCondFormList->CompileAll(); // nach ScNameDlg noetig /*N*/ /*N*/ for (USHORT i=0; i<=MAXTAB; i++) /*N*/ { @@ -478,7 +478,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pCondFormList->CompileAll(); /*N*/ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 short nType; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 short nType; //STRIP001 if ( (nType = GetFormatTable()->GetType( nFormat )) != NUMBERFORMAT_DATE //STRIP001 && nType != NUMBERFORMAT_TIME && nType != NUMBERFORMAT_DATETIME ) //STRIP001 { diff --git a/binfilter/bf_sc/source/core/data/sc_documen5.cxx b/binfilter/bf_sc/source/core/data/sc_documen5.cxx index 669e18162..4bbb8ca98 100644 --- a/binfilter/bf_sc/source/core/data/sc_documen5.cxx +++ b/binfilter/bf_sc/source/core/data/sc_documen5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_documen5.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:00 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -388,7 +388,7 @@ namespace binfilter { /*?*/ } /*?*/ if ( bChanged ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( nDz != 0 ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( nDz != 0 ) //STRIP001 /*?*/ { // #81844# sheet to be deleted or inserted or moved //STRIP001 /*?*/ // => no valid sheet names for references right now //STRIP001 /*?*/ pChartListener->ChangeListening( aNewRLR, bDataChanged ); @@ -427,7 +427,7 @@ namespace binfilter { /*N*/ SchMemChart* ScDocument::FindChartData(const String& rName, BOOL bForModify) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (!pDrawLayer) +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (!pDrawLayer) //STRIP001 return NULL; //STRIP001 //STRIP001 // die Seiten hier vom Draw-Layer nehmen, diff --git a/binfilter/bf_sc/source/core/data/sc_documen7.cxx b/binfilter/bf_sc/source/core/data/sc_documen7.cxx index 05e9446e6..0f106665e 100644 --- a/binfilter/bf_sc/source/core/data/sc_documen7.cxx +++ b/binfilter/bf_sc/source/core/data/sc_documen7.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_documen7.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -530,7 +530,7 @@ ULONG erCountBCAFinds = 0; /*?*/ SetForcedFormulas( TRUE ); /*?*/ if ( bAutoCalc && !IsAutoCalcShellDisabled() && !IsInInterpreter() /*?*/ && !IsCalculatingFormulaTree() ) -{DBG_ASSERT(0, "STRIP"); }//STRIP001 /*?*/ CalcFormulaTree( TRUE ); +{DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 /*?*/ CalcFormulaTree( TRUE ); /*?*/ else /*?*/ SetForcedFormulaPending( TRUE ); /*N*/ } @@ -569,7 +569,7 @@ ULONG erCountBCAFinds = 0; /*?*/ if ( IsAutoCalcShellDisabled() ) /*?*/ SetForcedFormulaPending( TRUE ); /*?*/ else if ( !IsInInterpreter() ) -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ CalcFormulaTree( TRUE ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ CalcFormulaTree( TRUE ); /*N*/ } /*N*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_documen8.cxx b/binfilter/bf_sc/source/core/data/sc_documen8.cxx index f3f24cc58..a239a667c 100644 --- a/binfilter/bf_sc/source/core/data/sc_documen8.cxx +++ b/binfilter/bf_sc/source/core/data/sc_documen8.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_documen8.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-05-04 15:17:44 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -479,7 +479,7 @@ namespace binfilter { /*N*/ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder versuchen { -DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( bIdleDisabled || IsInLinkUpdate() ) +DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( bIdleDisabled || IsInLinkUpdate() ) //STRIP001 return FALSE; //STRIP001 bIdleDisabled = TRUE; //STRIP001 @@ -856,7 +856,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( bIdleDisabled || IsInLi /*N*/ BOOL ScDocument::ContinueOnlineSpelling() /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( bIdleDisabled || !pDocOptions->IsAutoSpell() || (pShell && pShell->IsReadOnly()) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( bIdleDisabled || !pDocOptions->IsAutoSpell() || (pShell && pShell->IsReadOnly()) ) /*?*/ return FALSE; //STRIP001 //STRIP001 //! use one EditEngine for both calls @@ -930,7 +930,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( bIdleDisabled || IsInLi BOOL ScDocument::IdleCheckLinks() // TRUE = demnaechst wieder versuchen { -DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bAnyLeft = FALSE; +DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bAnyLeft = FALSE; //STRIP001 //STRIP001 if (pLinkManager) //STRIP001 { @@ -1037,7 +1037,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bAnyLeft = FALSE; /*N*/ void ScDocument::UpdateDdeLinks() /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (pLinkManager) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pLinkManager) //STRIP001 { //STRIP001 const ::so3::SvBaseLinks& rLinks = pLinkManager->GetLinks(); //STRIP001 USHORT nCount = rLinks.Count(); @@ -1085,7 +1085,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bAnyLeft = FALSE; /*N*/ BOOL bFound = FALSE; /*N*/ if (pLinkManager) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const ::so3::SvBaseLinks& rLinks = pLinkManager->GetLinks(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const ::so3::SvBaseLinks& rLinks = pLinkManager->GetLinks(); //STRIP001 USHORT nCount = rLinks.Count(); //STRIP001 for (USHORT i=0; i<nCount; i++) //STRIP001 { @@ -1246,7 +1246,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bAnyLeft = FALSE; /*N*/ BOOL ScDocument::GetDdeLinkResult(const ScMatrix* pMatrix, USHORT nCol, USHORT nRow, String& rStrValue, double& rDoubValue, BOOL& bIsString) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if (pMatrix) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pMatrix) //STRIP001 { //STRIP001 BOOL bIsEmpty = pMatrix->IsEmpty(nCol, nRow); //STRIP001 if (bIsEmpty) @@ -1270,7 +1270,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if (pMatrix) /*N*/ void ScDocument::CreateDdeLink(const String& rAppl, const String& rTopic, const String& rItem, const BYTE nMode ) /*N*/ { // DDE-Link anlegen und nicht updaten (z.B. fuer Excel-Import, -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // damit nicht ohne Nachfrage Verbindungen aufgebaut werden) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // damit nicht ohne Nachfrage Verbindungen aufgebaut werden) //STRIP001 // zuerst suchen, ob schon vorhanden //STRIP001 //! Dde-Links (zusaetzlich) effizienter am Dokument speichern? //STRIP001 if (pLinkManager) @@ -1299,7 +1299,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // damit nicht ohne Nachfrage V /*N*/ BOOL ScDocument::FindDdeLink(const String& rAppl, const String& rTopic, const String& rItem, const BYTE nMode, USHORT& nPos ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (pLinkManager) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pLinkManager) //STRIP001 { //STRIP001 const ::so3::SvBaseLinks& rLinks = pLinkManager->GetLinks(); //STRIP001 USHORT nCount = rLinks.Count(); @@ -1327,7 +1327,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // damit nicht ohne Nachfrage V /*N*/ BOOL ScDocument::CreateDdeLinkResultDimension(USHORT nPos, USHORT nCols, USHORT nRows, ScMatrix*& pMatrix) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nDdeCount = 0; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nDdeCount = 0; //STRIP001 if (pLinkManager) //STRIP001 { //STRIP001 const ::so3::SvBaseLinks& rLinks = pLinkManager->GetLinks(); @@ -1356,7 +1356,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nDdeCount = 0; void ScDocument::SetDdeLinkResult(ScMatrix* pMatrix, const USHORT nCol, const USHORT nRow, const String& rStrValue, const double& rDoubValue, BOOL bString, BOOL bEmpty) { -DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT(pMatrix, "there is no matrix"); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT(pMatrix, "there is no matrix"); //STRIP001 if (pMatrix) //STRIP001 { //STRIP001 if(bEmpty) @@ -1389,7 +1389,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT(pMatrix, "there is no matrix"); /*N*/ void ScDocument::UpdateAreaLinks() /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (pLinkManager) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pLinkManager) //STRIP001 { //STRIP001 const ::so3::SvBaseLinks& rLinks = pLinkManager->GetLinks(); //STRIP001 USHORT nCount = rLinks.Count(); @@ -1494,7 +1494,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT(pMatrix, "there is no matrix"); /*N*/ rStream >> nCount; /*N*/ for (USHORT i=0; i<nCount; i++) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aHdr.StartEntry(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aHdr.StartEntry(); /*?*/ //STRIP001 /*?*/ rStream.ReadByteString( aFile, rStream.GetStreamCharSet() ); //STRIP001 /*?*/ rStream.ReadByteString( aFilter, rStream.GetStreamCharSet() ); diff --git a/binfilter/bf_sc/source/core/data/sc_documen9.cxx b/binfilter/bf_sc/source/core/data/sc_documen9.cxx index a9a371995..96dade8c7 100644 --- a/binfilter/bf_sc/source/core/data/sc_documen9.cxx +++ b/binfilter/bf_sc/source/core/data/sc_documen9.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_documen9.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 14:30:35 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,7 +151,7 @@ BOOL lcl_AdjustRanges( ScRangeList& rRanges, USHORT nSource, USHORT nDest, USHOR BOOL bChanged = FALSE; - DBG_ASSERT(0, "STRIP"); //STRIP001 ULONG nCount = rRanges.Count(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ULONG nCount = rRanges.Count(); //STRIP001 for (ULONG i=0; i<nCount; i++) //STRIP001 { //STRIP001 ScRange* pRange = rRanges.GetObject(i); @@ -188,7 +188,7 @@ BOOL lcl_AdjustRanges( ScRangeList& rRanges, USHORT nSource, USHORT nDest, USHOR /*?*/ SdrObjListIter aIter( *pOldPage, IM_FLAT ); /*?*/ SdrObject* pOldObject = aIter.Next(); /*?*/ while (pOldObject) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrObject* pNewObject = pOldObject->Clone( pNewPage, pDrawLayer ); //STRIP001 /*?*/ pNewObject->NbcMove(Size(0,0)); //STRIP001 /*?*/ pNewPage->InsertObject( pNewObject ); @@ -751,7 +751,7 @@ BOOL lcl_AdjustRanges( ScRangeList& rRanges, USHORT nSource, USHORT nDest, USHOR /*N*/ USHORT nEndCol, USHORT nEndRow, BOOL bLeftIsEmpty, /*N*/ ScRange* pLastRange, Rectangle* pLastMM ) const /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 if (!IsBlockEmpty( nTab, nStartCol, nStartRow, nEndCol, nEndRow )) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (!IsBlockEmpty( nTab, nStartCol, nStartRow, nEndCol, nEndRow )) //STRIP001 return FALSE; //STRIP001 //STRIP001 ScDocument* pThis = (ScDocument*)this; //! GetMMRect / HasAnyDraw etc. const !!! diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx index f1864a964..b6663bf35 100644 --- a/binfilter/bf_sc/source/core/data/sc_document.cxx +++ b/binfilter/bf_sc/source/core/data/sc_document.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_document.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hjs $ $Date: 2004-04-15 13:45:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -321,7 +321,7 @@ namespace binfilter { /*N*/ if (pDPCollection) /*?*/ pDPCollection->UpdateReference( URM_INSDEL, aRange, 0,0,1 ); /*N*/ if (pDetOpList) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pDetOpList->UpdateReference( this, URM_INSDEL, aRange, 0,0,1 ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pDetOpList->UpdateReference( this, URM_INSDEL, aRange, 0,0,1 ); /*N*/ UpdateChartRef( URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 ); /*N*/ UpdateRefAreaLinks( URM_INSDEL, aRange, 0,0,1 ); /*N*/ if ( pUnoBroadcaster ) @@ -950,7 +950,7 @@ namespace binfilter { /*N*/ BOOL ScDocument::CanFitBlock( const ScRange& rOld, const ScRange& rNew ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 if ( rOld == rNew ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 if ( rOld == rNew ) //STRIP001 /*?*/ return TRUE; //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nTab = rOld.aStart.Tab(); @@ -983,7 +983,7 @@ namespace binfilter { /*N*/ void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (bClear) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (bClear) //STRIP001 /*?*/ DeleteAreaTab( rOld, IDF_ALL ); //STRIP001 /*?*/ //STRIP001 /*?*/ BOOL bInsCol,bDelCol,bInsRow,bDelRow; @@ -1233,7 +1233,7 @@ namespace binfilter { /*N*/ PutInOrder( nRow1, nRow2 ); /*N*/ if (!pClipDoc) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ DBG_ERROR("CopyToClip: no ClipDoc"); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ DBG_ERROR("CopyToClip: no ClipDoc"); //STRIP001 /*?*/ pClipDoc = SC_MOD()->GetClipDoc(); /*N*/ } /*N*/ @@ -1265,13 +1265,13 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ DBG_ERROR("CopyToClip: no Cl /*N*/ if (pTab[i] && pClipDoc->pTab[i]) /*N*/ if ( bAllTabs || !pMarks || pMarks->GetTableSelect(i) ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pTab[i]->CopyToClip(nCol1, nRow1, nCol2, nRow2, pClipDoc->pTab[i], bKeepScenarioFlags); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pTab[i]->CopyToClip(nCol1, nRow1, nCol2, nRow2, pClipDoc->pTab[i], bKeepScenarioFlags); /*N*/ /*N*/ if ( pDrawLayer && bIncludeObjects ) /*N*/ { /*N*/ // also copy drawing objects /*N*/ -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ Rectangle aObjRect = GetMMRect( nCol1, nRow1, nCol2, nRow2, i ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ Rectangle aObjRect = GetMMRect( nCol1, nRow1, nCol2, nRow2, i ); //STRIP001 /*?*/ pDrawLayer->CopyToClip( pClipDoc, i, aObjRect ); /*N*/ } /*N*/ } @@ -1387,7 +1387,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ Rectangle aObjRe /*N*/ USHORT nCol2, USHORT nRow2, /*N*/ const ScMarkData& rMark, USHORT nInsFlag ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if (nInsFlag & IDF_CONTENTS) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (nInsFlag & IDF_CONTENTS) //STRIP001 { //STRIP001 for (USHORT i = 0; i <= MAXTAB; i++) //STRIP001 if (pTab[i]) @@ -1401,7 +1401,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if (nInsFlag & IDF_CONTENTS) /*N*/ USHORT nCol2, USHORT nRow2, /*N*/ const ScMarkData& rMark, USHORT nInsFlag ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (nInsFlag & IDF_CONTENTS) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (nInsFlag & IDF_CONTENTS) //STRIP001 { //STRIP001 USHORT nClipTab = 0; //STRIP001 for (USHORT i = 0; i <= MAXTAB; i++) @@ -1418,7 +1418,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (nInsFlag & IDF_CONTENTS) /*N*/ short nDx, short nDy, /*N*/ const ScCopyBlockFromClipParams* pCBFCP ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ScTable** ppClipTab = pCBFCP->pClipDoc->pTab; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ScTable** ppClipTab = pCBFCP->pClipDoc->pTab; //STRIP001 USHORT nTabEnd = pCBFCP->nTabEnd; //STRIP001 USHORT i; //STRIP001 USHORT nClipTab = 0; @@ -1497,7 +1497,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ScTable** ppClipTab = pCBFCP->pC /*N*/ short nDx, short nDy, /*N*/ const ScCopyBlockFromClipParams* pCBFCP ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for ranges of consecutive non-filtered rows +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for ranges of consecutive non-filtered rows //STRIP001 // nCol1/nRow1 etc. is in target doc //STRIP001 //STRIP001 // filtered state is taken from first used table in clipboard (as in GetClipArea) @@ -1766,7 +1766,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // call CopyBlockFromClip for r /*N*/ void ScDocument::GetClipArea(USHORT& nClipX, USHORT& nClipY, BOOL bIncludeFiltered) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) //STRIP001 { //STRIP001 nClipX = aClipRange.aEnd.Col() - aClipRange.aStart.Col(); //STRIP001 @@ -2891,7 +2891,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) /*N*/ BOOL ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 //STRIP001 if ( bStyleSheetUsageInvalid || rStyle.GetUsage() == ScStyleSheet::UNKNOWN ) //STRIP001 { //STRIP001 if ( bGatherAllStyles ) @@ -2975,7 +2975,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) /*N*/ BOOL ScDocument::RemoveFlagsTab( USHORT nStartCol, USHORT nStartRow, /*N*/ USHORT nEndCol, USHORT nEndRow, USHORT nTab, INT16 nFlags ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (VALIDTAB(nTab)) //STRIP001 if (pTab[nTab]) //STRIP001 return pTab[nTab]->RemoveFlags( nStartCol, nStartRow, nEndCol, nEndRow, nFlags ); @@ -3233,7 +3233,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) /*N*/ BOOL ScDocument::IsBlockEmpty( USHORT nTab, USHORT nStartCol, USHORT nStartRow, /*N*/ USHORT nEndCol, USHORT nEndRow ) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (VALIDTAB(nTab)) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (VALIDTAB(nTab)) //STRIP001 /*?*/ if (pTab[nTab]) //STRIP001 /*?*/ return pTab[nTab]->IsBlockEmpty( nStartCol, nStartRow, nEndCol, nEndRow ); //STRIP001 /*?*/ @@ -3537,7 +3537,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip) /*N*/ bFound = pTab[nTab]->ExtendMerge( nStartCol, nStartRow, rEndCol, rEndRow, bRefresh, bAttrs ); /*N*/ /*N*/ if (bRefresh) -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RefreshAutoFilter( nStartCol, nStartRow, rEndCol, rEndRow, nTab ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RefreshAutoFilter( nStartCol, nStartRow, rEndCol, rEndRow, nTab ); /*N*/ } /*N*/ else /*N*/ DBG_ERROR("ExtendMerge: falscher Bereich"); @@ -3800,7 +3800,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RefreshAutoFilter( nStartCol /*N*/ void ScDocument::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i=0; i<=MAXTAB; i++) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i=0; i<=MAXTAB; i++) //STRIP001 /*?*/ if (pTab[i] && rMark.GetTableSelect(i)) //STRIP001 /*?*/ pTab[i]->ChangeSelectionIndent( bIncrement, rMark ); /*N*/ } @@ -3808,7 +3808,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RefreshAutoFilter( nStartCol /*N*/ void ScDocument::ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i=0; i<=MAXTAB; i++) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i=0; i<=MAXTAB; i++) //STRIP001 /*?*/ if (pTab[i] && rMark.GetTableSelect(i)) //STRIP001 /*?*/ pTab[i]->ClearSelectionItems( pWhich, rMark ); /*N*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx index 42fda8df0..d861a32d2 100644 --- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx +++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_dpobject.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:01 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,7 +213,7 @@ using namespace ::com::sun::star; /*N*/ DataObject* ScDPObject::Clone() const /*N*/ { -DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new ScDPObject(*this); +DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new ScDPObject(*this); /*N*/ } /*N*/ void ScDPObject::SetAlive(BOOL bSet) @@ -262,7 +262,7 @@ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new ScDPObject(*this); /*N*/ void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pImpDesc && rDesc == *pImpDesc ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pImpDesc && rDesc == *pImpDesc ) //STRIP001 return; // nothing to do //STRIP001 //STRIP001 DELETEZ( pSheetDesc ); @@ -276,7 +276,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pImpDesc && rDesc == *pImpDesc ) /*N*/ void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc ) //STRIP001 return; // nothing to do //STRIP001 //STRIP001 DELETEZ( pSheetDesc ); @@ -343,12 +343,12 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc ) /*N*/ /*N*/ if ( pImpDesc ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDatabaseDPData* pData = new ScDatabaseDPData( pDoc->GetServiceManager(), *pImpDesc ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDatabaseDPData* pData = new ScDatabaseDPData( pDoc->GetServiceManager(), *pImpDesc ); //STRIP001 /*?*/ xSource = new ScDPSource( pData ); /*N*/ } /*N*/ else if ( pServDesc ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 xSource = CreateSource( *pServDesc ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 xSource = CreateSource( *pServDesc ); /*N*/ } /*N*/ /*N*/ if ( !xSource.is() ) // sheet data or error in above cases @@ -431,7 +431,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc ) /*N*/ void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode, /*N*/ const ScRange& rRange, short nDx, short nDy, short nDz ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 // Output area + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Output area //STRIP001 //STRIP001 USHORT nCol1 = aOutRange.aStart.Col(); //STRIP001 USHORT nRow1 = aOutRange.aStart.Row(); @@ -488,7 +488,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pServDesc && rDesc == *pServDesc ) /*N*/ BOOL ScDPObject::RefsEqual( const ScDPObject& r ) const /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( aOutRange != r.aOutRange ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( aOutRange != r.aOutRange ) //STRIP001 return FALSE; //STRIP001 //STRIP001 if ( pSheetDesc && r.pSheetDesc ) @@ -507,7 +507,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( aOutRange != r.aOutRange ) /*N*/ void ScDPObject::WriteRefsTo( ScDPObject& r ) const /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 r.SetOutRange( aOutRange ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 r.SetOutRange( aOutRange ); //STRIP001 if ( pSheetDesc ) //STRIP001 r.SetSheetDesc( *pSheetDesc ); /*N*/ } @@ -826,7 +826,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 r.SetOutRange( aOutRange ); /*N*/ { /*?*/ uno::Reference<container::XNamed> xNameOrig( xIntOrig, uno::UNO_QUERY ); /*?*/ if ( xNameOrig.is() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nDupSource = lcl_FindName( xNameOrig->getName(), xDimsName ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nDupSource = lcl_FindName( xNameOrig->getName(), xDimsName ); /*N*/ } /*N*/ /*N*/ BOOL bDupUsed = FALSE; @@ -1311,7 +1311,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 r.SetOutRange( aOutRange ); /*N*/ if ( pDoc ) /*N*/ pDoc->GetString( nCol, nRow, nTab, aDocStr ); /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 aDocStr = lcl_GetDimName( xSource, nCol ); // cols must start at 0 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aDocStr = lcl_GetDimName( xSource, nCol ); // cols must start at 0 /*N*/ /*N*/ if ( aDocStr.Len() ) /*N*/ pDim = rSaveData.GetDimensionByName(aDocStr); @@ -1567,7 +1567,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 r.SetOutRange( aOutRange ); /*N*/ DataObject* ScDPCollection::Clone() const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new ScDPCollection(*this); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new ScDPCollection(*this); /*N*/ } /*N*/ BOOL ScDPCollection::StoreOld( SvStream& rStream ) const diff --git a/binfilter/bf_sc/source/core/data/sc_dpoutput.cxx b/binfilter/bf_sc/source/core/data/sc_dpoutput.cxx index 568c5416d..f29c252b4 100644 --- a/binfilter/bf_sc/source/core/data/sc_dpoutput.cxx +++ b/binfilter/bf_sc/source/core/data/sc_dpoutput.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_dpoutput.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:02 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -323,7 +323,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS nColFmtCount( 0 ), nRowFmtCount( 0 ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 nTabStartCol = nTabStartRow = nMemberStartCol = nMemberStartRow = + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 nTabStartCol = nTabStartRow = nMemberStartCol = nMemberStartRow = //STRIP001 nDataStartCol = nDataStartRow = nTabEndCol = nTabEndRow = 0; //STRIP001 //STRIP001 pColFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS]; diff --git a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx index 543199eb1..e607722eb 100644 --- a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx +++ b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_dpshttab.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:02 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,7 +151,7 @@ namespace binfilter { /*N*/ } /*N*/ void ScSheetDPData::DisposeData() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for (long i=0; i<pImpl->nColCount; i++) //STRIP001 { //STRIP001 delete pImpl->ppStrings[i]; @@ -171,7 +171,7 @@ namespace binfilter { //STRIP001 } /*N*/ const TypedStrCollection& ScSheetDPData::GetColumnEntries(long nColumn) -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 DBG_ASSERT(nColumn>=0 && nColumn<pImpl->nColCount, "ScSheetDPData: wrong column"); //STRIP001 //STRIP001 if (!pImpl->ppStrings[nColumn]) @@ -291,7 +291,7 @@ namespace binfilter { /*N*/ } /*N*/ UINT32 ScSheetDPData::GetNumberFormat(long nDim) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 //STRIP001 if (getIsDataLayoutDimension(nDim)) //STRIP001 { //STRIP001 return 0; @@ -351,7 +351,7 @@ namespace binfilter { //STRIP001 } /*N*/ BOOL ScSheetDPData::GetNextRow( const ScDPTableIteratorParam& rParam ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 //STRIP001 if ( pImpl->nNextRow > pImpl->aRange.aEnd.Row() ) //STRIP001 return FALSE; //STRIP001 diff --git a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx index 3fb267616..4ae57f430 100644 --- a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx +++ b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_dptabsrc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:03 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -380,7 +380,7 @@ using namespace ::com::sun::star; /*?*/ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResults() /*?*/ throw(uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return uno::Sequence< uno::Sequence<sheet::DataResult> >(0); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Sequence< uno::Sequence<sheet::DataResult> >(0); //STRIP001 //STRIP001 CreateRes_Impl(); // create pColResRoot and pRowResRoot //STRIP001 //STRIP001 if ( bResultOverflow ) // set in CreateRes_Impl @@ -411,7 +411,7 @@ using namespace ::com::sun::star; /*?*/ } /*?*/ void SAL_CALL ScDPSource::refresh() throw(uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ disposeData(); /*?*/ } @@ -871,7 +871,7 @@ using namespace ::com::sun::star; /*?*/ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo() /*?*/ throw(uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return uno::Reference<beans::XPropertySetInfo>(0); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Reference<beans::XPropertySetInfo>(0); //STRIP001 //STRIP001 ScUnoGuard aGuard; //STRIP001 //STRIP001 static SfxItemPropertyMap aDPSourceMap_Impl[] = @@ -924,7 +924,7 @@ using namespace ::com::sun::star; /*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_REPEATIF ) ) /*N*/ lcl_SetBoolInAny( aRet, getRepeatIfEmpty() ); /*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_DATADESC ) ) // read-only -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 aRet <<= ::rtl::OUString( getDataDescription() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aRet <<= ::rtl::OUString( getDataDescription() ); /*N*/ else /*N*/ { /*N*/ DBG_ERROR("unknown property"); @@ -1176,7 +1176,7 @@ using namespace ::com::sun::star; //STRIP001 } /*?*/ uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() throw(uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return uno::Reference<util::XCloneable>(0); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Reference<util::XCloneable>(0); //STRIP001 //STRIP001 /*?*/ return CreateCloneObject(); /*?*/ } @@ -1189,7 +1189,7 @@ using namespace ::com::sun::star; /*?*/ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetInfo() /*?*/ throw(uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return uno::Reference<beans::XPropertySetInfo>(0); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Reference<beans::XPropertySetInfo>(0); //STRIP001 //STRIP001 ScUnoGuard aGuard; //STRIP001 //STRIP001 static SfxItemPropertyMap aDPDimensionMap_Impl[] = @@ -1216,7 +1216,7 @@ using namespace ::com::sun::star; /*N*/ String aNameStr = aPropertyName; /*N*/ if ( aNameStr.EqualsAscii( SC_UNO_POSITION ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 INT32 nInt; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 INT32 nInt; //STRIP001 /*?*/ if (aValue >>= nInt) //STRIP001 /*?*/ setPosition( nInt ); /*N*/ } @@ -1224,7 +1224,7 @@ using namespace ::com::sun::star; /*N*/ { /*?*/ INT32 nInt; /*?*/ if (aValue >>= nInt) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 setUsedHierarchy( nInt ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 setUsedHierarchy( nInt ); /*N*/ } /*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_ORIENTAT ) ) /*N*/ { @@ -1268,7 +1268,7 @@ using namespace ::com::sun::star; /*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_ISDATALA ) ) // read-only properties /*N*/ lcl_SetBoolInAny( aRet, getIsDataLayoutDimension() ); /*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_NUMBERFO ) ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 aRet <<= (sal_Int32) pSource->GetData()->GetNumberFormat( +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aRet <<= (sal_Int32) pSource->GetData()->GetNumberFormat( //STRIP001 /*?*/ ( nSourceDim >= 0 ) ? nSourceDim : nDim ); /*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_ORIGINAL ) ) /*N*/ { @@ -1595,7 +1595,7 @@ using namespace ::com::sun::star; /*N*/ //! release pSource /*N*/ /*N*/ if ( pMembers ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pMembers->release(); // ref-counted +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pMembers->release(); // ref-counted /*N*/ } //STRIP001 ScDPMembers* ScDPLevel::GetMembersObject() @@ -1609,12 +1609,12 @@ using namespace ::com::sun::star; //STRIP001 } /*?*/ uno::Reference<container::XNameAccess> SAL_CALL ScDPLevel::getMembers() throw(uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return uno::Reference<container::XNameAccess>(0); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Reference<container::XNameAccess>(0); //STRIP001 //STRIP001 /*?*/ return GetMembersObject(); /*?*/ } /*?*/ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const uno::Sequence<sheet::MemberResult>* pRes = pSource->GetMemberResults( this ); //STRIP001 /*?*/ if (pRes) //STRIP001 /*?*/ return *pRes; @@ -1731,7 +1731,7 @@ using namespace ::com::sun::star; /*N*/ { /*?*/ uno::Sequence<sheet::GeneralFunction> aSeq; /*?*/ if ( aValue >>= aSeq ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 setSubTotals( aSeq ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 setSubTotals( aSeq ); /*N*/ } /*N*/ else /*N*/ { @@ -1747,7 +1747,7 @@ using namespace ::com::sun::star; /*N*/ uno::Any aRet; /*N*/ String aNameStr = aPropertyName; /*N*/ if ( aNameStr.EqualsAscii( SC_UNO_SHOWEMPT ) ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 lcl_SetBoolInAny( aRet, getShowEmpty() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 lcl_SetBoolInAny( aRet, getShowEmpty() ); /*N*/ else if ( aNameStr.EqualsAscii( SC_UNO_SUBTOTAL ) ) /*N*/ { /*N*/ uno::Sequence<sheet::GeneralFunction> aSeq = getSubTotals(); //! avoid extra copy? diff --git a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx index 04ee2c4ac..dcef217a6 100644 --- a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx +++ b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_drwlayer.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hjs $ $Date: 2004-04-15 13:45:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -548,7 +548,7 @@ BOOL bDrawIsInUndo = FALSE; //! Member /*N*/ SdrObject* pObj = pPage->GetObj( i ); /*N*/ ScDrawObjData* pData = GetObjData( pObj ); /*N*/ if( pData ) -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RecalcPos( pObj, pData ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RecalcPos( pObj, pData ); /*N*/ } /*N*/ } /*N*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_global.cxx b/binfilter/bf_sc/source/core/data/sc_global.cxx index 10cf2e514..717590113 100644 --- a/binfilter/bf_sc/source/core/data/sc_global.cxx +++ b/binfilter/bf_sc/source/core/data/sc_global.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_global.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -593,7 +593,7 @@ void global_InitAppOptions(); /*N*/ SvxBrushItem* ScGlobal::GetButtonBrushItem() /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 pButtonBrushItem->SetColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 pButtonBrushItem->SetColor( Application::GetSettings().GetStyleSettings().GetFaceColor() ); //STRIP001 return pButtonBrushItem; /*N*/ } @@ -1472,7 +1472,7 @@ void global_InitAppOptions(); /*N*/ ScFunctionList::ScFunctionList() : /*N*/ nMaxFuncNameLen ( 0 ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScFuncDesc* pDesc = NULL; +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScFuncDesc* pDesc = NULL; //STRIP001 xub_StrLen nStrLen = 0; //STRIP001 FuncCollection* pFuncColl; //STRIP001 USHORT i,j; @@ -1781,7 +1781,7 @@ void global_InitAppOptions(); /*N*/ : pFuncList ( ScGlobal::GetStarCalcFunctionList() ), /*N*/ pCurCatList ( NULL ) /*N*/{ -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*N*/ DBG_ASSERT( pFuncList, "Funktionsliste nicht gefunden." ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ DBG_ASSERT( pFuncList, "Funktionsliste nicht gefunden." ); //STRIP001 ULONG nCount = pFuncList->GetCount(); //STRIP001 ScFuncDesc* pDesc; //STRIP001 List* pRootList; @@ -1820,7 +1820,7 @@ void global_InitAppOptions(); /*N*/ ScFunctionMgr::~ScFunctionMgr() /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i = 0; i < MAX_FUNCCAT; i++) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i = 0; i < MAX_FUNCCAT; i++) //STRIP001 delete aCatLists[i]; //STRIP001 // delete pFuncList; // Macht später die App /*N*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_global2.cxx b/binfilter/bf_sc/source/core/data/sc_global2.cxx index f8d5d54f8..7e0b8c453 100644 --- a/binfilter/bf_sc/source/core/data/sc_global2.cxx +++ b/binfilter/bf_sc/source/core/data/sc_global2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_global2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hjs $ $Date: 2004-04-15 13:45:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -381,7 +381,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const BOOL bEqual = FALSE; // Anzahl der Queries gleich? - DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nUsed = 0; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nUsed = 0; //STRIP001 USHORT nOtherUsed = 0; //STRIP001 while ( nUsed<nEntryCount && pEntries[nUsed].bDoQuery ) ++nUsed; //STRIP001 while ( nOtherUsed<rOther.nEntryCount && rOther.pEntries[nOtherUsed].bDoQuery ) @@ -908,7 +908,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const /*N*/ void ScConsolidateParam::Load( SvStream& rStream ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ClearDataAreas(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearDataAreas(); //STRIP001 //STRIP001 ScReadHeader aHdr( rStream ); //STRIP001 @@ -931,7 +931,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const /*N*/ void ScConsolidateParam::Store( SvStream& rStream ) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScWriteHeader aHdr( rStream, 12+10*nDataAreaCount ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScWriteHeader aHdr( rStream, 12+10*nDataAreaCount ); //STRIP001 //STRIP001 rStream << nCol << nRow << nTab //STRIP001 << bByCol << bByRow << bReferenceData << (BYTE) eFunction; @@ -1036,7 +1036,7 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const /*N*/ USHORT nRowCnt, /*N*/ USHORT nDataCnt ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 ClearPivotArrays(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearPivotArrays(); //STRIP001 //STRIP001 if ( pColArr && pRowArr && pDataArr ) //STRIP001 { diff --git a/binfilter/bf_sc/source/core/data/sc_globalx.cxx b/binfilter/bf_sc/source/core/data/sc_globalx.cxx index 4d4dfa5d9..e27518b06 100644 --- a/binfilter/bf_sc/source/core/data/sc_globalx.cxx +++ b/binfilter/bf_sc/source/core/data/sc_globalx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_globalx.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:05 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,7 +149,7 @@ namespace binfilter { /*?*/ #else /*?*/ ::rtl::OUString aId( xContentAccess->queryContentIdentfierString() ); /*?*/ #endif -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 InitExternalFunc( aId ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 InitExternalFunc( aId ); /*?*/ } /*?*/ while ( xResultSet->next() ); /*?*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx index c8167248d..b908e7581 100644 --- a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx +++ b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_olinetab.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -718,7 +718,7 @@ namespace binfilter { /*?*/ BOOL bToggle = ( bShow != bAllHidden ); /*?*/ if ( bToggle ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pEntry->SetHidden( !bShow ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pEntry->SetHidden( !bShow ); //STRIP001 /*?*/ SetVisibleBelow( aIter.LastLevel(), aIter.LastEntry(), bShow, bShow ); //STRIP001 /*?*/ bModified = TRUE; /*?*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_pivot.cxx b/binfilter/bf_sc/source/core/data/sc_pivot.cxx index 239052c1e..893e0188b 100644 --- a/binfilter/bf_sc/source/core/data/sc_pivot.cxx +++ b/binfilter/bf_sc/source/core/data/sc_pivot.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_pivot.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1303,7 +1303,7 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] = /*N*/ BOOL bValidLine = TRUE; /*N*/ if (bIgnoreEmpty) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aSrcAdr.SetRow( nRow ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aSrcAdr.SetRow( nRow ); //STRIP001 /*?*/ bValidLine = !lcl_IsEmptyLine( pDoc, aSrcAdr, nSrcCol2 ); /*N*/ } /*N*/ if (bValidLine) @@ -1369,7 +1369,7 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] = /*N*/ BOOL bValidLine = TRUE; /*N*/ if (bIgnoreEmpty) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aSrcAdr.SetRow( nRow ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aSrcAdr.SetRow( nRow ); //STRIP001 /*?*/ bValidLine = !lcl_IsEmptyLine( pDoc, aSrcAdr, nSrcCol2 ); /*N*/ } /*N*/ if (bValidLine) @@ -1453,7 +1453,7 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] = /*N*/ ppDataArr[nRIndex][nCIndex].Update(nVal); /*N*/ } /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ppDataArr[nRIndex][nCIndex].UpdateNoVal(); // nur nCount +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ppDataArr[nRIndex][nCIndex].UpdateNoVal(); // nur nCount /*N*/ } /*N*/ } /*N*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_pivot2.cxx b/binfilter/bf_sc/source/core/data/sc_pivot2.cxx index bcde86da4..e240b18a8 100644 --- a/binfilter/bf_sc/source/core/data/sc_pivot2.cxx +++ b/binfilter/bf_sc/source/core/data/sc_pivot2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_pivot2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -333,7 +333,7 @@ namespace binfilter { /*N*/ // Strings vergleichen: /*N*/ /*N*/ if (pUserData) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nResult = pUserData->ICompare(rData1.aStrValue, rData2.aStrValue); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nResult = pUserData->ICompare(rData1.aStrValue, rData2.aStrValue); /*N*/ else /*N*/ { /*N*/ nResult = (short) ScGlobal::pTransliteration->compareString( diff --git a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx index 22f895595..28355aff0 100644 --- a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx +++ b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_stlpool.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -181,7 +181,7 @@ namespace binfilter { /*N*/ SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 DBG_ASSERT( rStyle.ISA(ScStyleSheet), "Invalid StyleSheet-class! :-/" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 DBG_ASSERT( rStyle.ISA(ScStyleSheet), "Invalid StyleSheet-class! :-/" ); //STRIP001 return new ScStyleSheet( (const ScStyleSheet&) rStyle ); /*N*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx b/binfilter/bf_sc/source/core/data/sc_table1.cxx index 7e60a00d2..d8ee1da80 100644 --- a/binfilter/bf_sc/source/core/data/sc_table1.cxx +++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_table1.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:09 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -236,7 +236,7 @@ extern BOOL bIsOlk, bOderSo; /*?*/ /*?*/ ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer(); /*?*/ if (pDrawLayer) -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pDrawLayer->ScRemovePage( nTab ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pDrawLayer->ScRemovePage( nTab ); /*N*/ } /*N*/ /*N*/ delete[] pColWidth; @@ -262,7 +262,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pDrawLayer->ScRemovePage( nT /*N*/ { /*N*/ String aMd( "D\344umling", RTL_TEXTENCODING_MS_1252 ); // ANSI /*N*/ if( rNewName == aMd ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 bIsOlk = bOderSo = TRUE; +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 bIsOlk = bOderSo = TRUE; /*N*/ aName = rNewName; /*N*/ } @@ -624,7 +624,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pDrawLayer->ScRemovePage( nT /*N*/ void ScTable::GetDataArea( USHORT& rStartCol, USHORT& rStartRow, USHORT& rEndCol, USHORT& rEndRow, /*N*/ BOOL bIncludeOld ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 BOOL bLeft = FALSE; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 BOOL bLeft = FALSE; //STRIP001 BOOL bRight = FALSE; //STRIP001 BOOL bTop = FALSE; //STRIP001 BOOL bBottom = FALSE; @@ -847,7 +847,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 BOOL bLeft = FALSE; /*N*/ void ScTable::GetNextPos( USHORT& rCol, USHORT& rRow, short nMovX, short nMovY, /*N*/ BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bUnprotected && !IsProtected()) // Tabelle ueberhaupt geschuetzt? +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bUnprotected && !IsProtected()) // Tabelle ueberhaupt geschuetzt? //STRIP001 bUnprotected = FALSE; //STRIP001 //STRIP001 USHORT nWrap = 0; @@ -1053,7 +1053,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bUnprotected && !IsProtected /*N*/ { /*N*/ if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // only within the table /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer(); //STRIP001 /*?*/ if ( eUpdateRefMode != URM_COPY && pDrawLayer ) //STRIP001 /*?*/ { //STRIP001 /*?*/ if ( eUpdateRefMode == URM_MOVE ) @@ -1243,7 +1243,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScDrawLayer* pDrawLayer = pDocum /*N*/ USHORT nCol2, USHORT nRow2, /*N*/ const ScIndexMap& rMap ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for (USHORT i = nCol1; i <= nCol2 && (i <= MAXCOL); i++) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for (USHORT i = nCol1; i <= nCol2 && (i <= MAXCOL); i++) //STRIP001 { //STRIP001 aCol[i].ReplaceRangeNamesInUse( nRow1, nRow2, rMap ); //STRIP001 } diff --git a/binfilter/bf_sc/source/core/data/sc_table2.cxx b/binfilter/bf_sc/source/core/data/sc_table2.cxx index 8aaff7e9b..2e1b84a55 100644 --- a/binfilter/bf_sc/source/core/data/sc_table2.cxx +++ b/binfilter/bf_sc/source/core/data/sc_table2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_table2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,7 @@ void lcl_SaveRange( SvStream& rStream, ScRange* pRange ); /*N*/ /*N*/ if (pOutlineTable) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nOldSizeX = pOutlineTable->GetColArray()->GetDepth(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nOldSizeX = pOutlineTable->GetColArray()->GetDepth(); //STRIP001 /*?*/ nOldSizeY = pOutlineTable->GetRowArray()->GetDepth(); //STRIP001 /*?*/ delete pOutlineTable; /*N*/ } @@ -671,7 +671,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nOldSizeX = pOutlineTable->GetCo /*N*/ pDestTab->pColFlags[i] = pColFlags[i]; /*N*/ //! Aenderungen zusammenfassen? /*N*/ if (bChange) -/*?*/ { DBG_ASSERT(0, "STRIP");} //STRIP001 pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab )); +/*?*/ { DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab )); /*N*/ } /*N*/ /*N*/ if (nCol1==0 && nCol2==MAXCOL && pRowHeight && pDestTab->pRowHeight) @@ -683,7 +683,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nOldSizeX = pOutlineTable->GetCo /*N*/ pDestTab->pRowFlags[i] = pRowFlags[i]; /*N*/ //! Aenderungen zusammenfassen? /*N*/ if (bChange) -/*?*/ { DBG_ASSERT(0, "STRIP");} //STRIP001 pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab )); +/*?*/ { DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pCharts->SetRangeDirty(ScRange( 0, i, nTab, MAXCOL, i, nTab )); /*N*/ } /*N*/ /*N*/ pDestTab->SetOutlineTable( pOutlineTable ); // auch nur wenn bColRowFlags @@ -830,7 +830,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nOldSizeX = pOutlineTable->GetCo /*N*/ if (pCell) /*N*/ aCol[nCol].Insert( nRow, pCell ); /*N*/ else -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[nCol].Delete( nRow ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[nCol].Delete( nRow ); /*N*/ } /*N*/ } @@ -842,7 +842,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[nCol].Delete( nRow ); /*N*/ if (pCell) /*N*/ aCol[nCol].Insert( nRow, nFormatIndex, pCell ); /*N*/ else -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[nCol].Delete( nRow ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[nCol].Delete( nRow ); /*N*/ } /*N*/ } @@ -852,7 +852,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[nCol].Delete( nRow ); /*N*/ if (pCell) /*N*/ aCol[rPos.Col()].Insert( rPos.Row(), pCell ); /*N*/ else -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Row() ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Row() ); /*N*/ } @@ -908,7 +908,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Ro /*N*/ double ScTable::GetValue( USHORT nCol, USHORT nRow ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0.0;//STRIP001 if (ValidColRow( nCol, nRow )) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0.0;//STRIP001 if (ValidColRow( nCol, nRow )) //STRIP001 return aCol[nCol].GetValue( nRow ); //STRIP001 return 0.0; /*N*/ } @@ -1036,7 +1036,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Ro /*N*/ void ScTable::SetDirty( const ScRange& rRange ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bOldAutoCalc = pDocument->GetAutoCalc(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bOldAutoCalc = pDocument->GetAutoCalc(); //STRIP001 pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden //STRIP001 USHORT nCol2 = rRange.aEnd.Col(); //STRIP001 for (USHORT i=rRange.aStart.Col(); i<=nCol2; i++) @@ -1462,7 +1462,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Ro /*N*/ if ( nLockCount ) /*N*/ bIsEditable = FALSE; /*N*/ else if ( bProtected ) -{DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ bIsEditable = !HasAttribSelection( rMark, HASATTR_PROTECTED ); +{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ bIsEditable = !HasAttribSelection( rMark, HASATTR_PROTECTED ); /*N*/ else /*N*/ bIsEditable = TRUE; /*N*/ if ( bIsEditable ) @@ -1516,7 +1516,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aCol[rPos.Col()].Delete( rPos.Ro /*N*/ void ScTable::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, /*N*/ USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow ) const /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow)) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow)) //STRIP001 { //STRIP001 PutInOrder(nStartCol, nEndCol); //STRIP001 PutInOrder(nStartRow, nEndRow); @@ -1530,7 +1530,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStar /*N*/ void ScTable::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, /*N*/ USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow)) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow)) //STRIP001 { //STRIP001 PutInOrder(nStartCol, nEndCol); //STRIP001 PutInOrder(nStartRow, nEndRow); @@ -1680,7 +1680,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStar /*N*/ /*N*/ for ( USHORT i=0; i<=MAXCOL; i++ ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( aCol[i].IsStyleSheetUsed( rStyle, bGatherAllStyles ) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( aCol[i].IsStyleSheetUsed( rStyle, bGatherAllStyles ) ) //STRIP001 { //STRIP001 if ( !bGatherAllStyles ) //STRIP001 return TRUE; @@ -2080,7 +2080,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStar /*N*/ /*N*/ ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection(); /*N*/ if ( pCharts && pCharts->GetCount() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pCharts->SetRangeDirty(ScRange( nCol, 0, nTab, nCol, MAXROW, nTab )); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pCharts->SetRangeDirty(ScRange( nCol, 0, nTab, nCol, MAXROW, nTab )); /*N*/ } /*N*/ } /*N*/ else @@ -2090,7 +2090,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (ValidColRow(nStartCol, nStar /*N*/ void ScTable::ShowRow(USHORT nRow, BOOL bShow) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (VALIDROW(nRow) && pRowFlags) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (VALIDROW(nRow) && pRowFlags) //STRIP001 { //STRIP001 BOOL bWasVis = ( pRowFlags[nRow] & CR_HIDDEN ) == 0; //STRIP001 if (bWasVis != bShow) @@ -2262,7 +2262,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (VALIDROW(nRow) && pRowFlags) /*N*/ { /*N*/ ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection(); /*N*/ if ( pCharts && pCharts->GetCount() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pCharts->SetRangeDirty(ScRange( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab )); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pCharts->SetRangeDirty(ScRange( 0, nStartRow, nTab, MAXCOL, nEndRow, nTab )); /*N*/ } /*N*/ /*N*/ nStartRow = nEndRow + 1; @@ -2377,7 +2377,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (VALIDROW(nRow) && pRowFlags) /*N*/ BOOL ScTable::UpdateOutlineCol( USHORT nStartCol, USHORT nEndCol, BOOL bShow ) /*N*/ { /*N*/ if (pOutlineTable && pColFlags) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 return pOutlineTable->GetColArray()->ManualAction( nStartCol, nEndCol, bShow, pColFlags ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 return pOutlineTable->GetColArray()->ManualAction( nStartCol, nEndCol, bShow, pColFlags ); /*N*/ else /*N*/ return FALSE; /*N*/ } diff --git a/binfilter/bf_sc/source/core/data/sc_table3.cxx b/binfilter/bf_sc/source/core/data/sc_table3.cxx index 465912e16..84da8494f 100644 --- a/binfilter/bf_sc/source/core/data/sc_table3.cxx +++ b/binfilter/bf_sc/source/core/data/sc_table3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_table3.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:09 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -235,7 +235,7 @@ struct ScSortInfo /*N*/ { /*N*/ if ( pSortCollator ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if ( !IsSortCollatorGlobal() ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if ( !IsSortCollatorGlobal() ) //STRIP001 /*?*/ delete pSortCollator; //STRIP001 /*?*/ pSortCollator = NULL; /*N*/ } @@ -1607,7 +1607,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if ( !IsSortCollatorGlobal() ) /*N*/ BOOL ScTable::CreateQueryParam(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, ScQueryParam& rQueryParam) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 USHORT i, nCount; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 USHORT i, nCount; //STRIP001 PutInOrder(nCol1, nCol2); //STRIP001 PutInOrder(nRow1, nRow2); //STRIP001 diff --git a/binfilter/bf_sc/source/core/data/sc_validat.cxx b/binfilter/bf_sc/source/core/data/sc_validat.cxx index 2dd07459c..40e85ae1a 100644 --- a/binfilter/bf_sc/source/core/data/sc_validat.cxx +++ b/binfilter/bf_sc/source/core/data/sc_validat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_validat.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:10 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -454,7 +454,7 @@ namespace binfilter { /*N*/ BOOL ScValidationData::IsDataValid( const String& rTest, const ScPatternAttr& rPattern, /*N*/ const ScAddress& rPos ) const /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if ( eDataMode == SC_VALID_ANY ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( eDataMode == SC_VALID_ANY ) //STRIP001 return TRUE; // alles erlaubt //STRIP001 //STRIP001 if ( rTest.GetChar(0) == '=' ) @@ -485,7 +485,7 @@ return FALSE;//STRIP001 return bRet; /*N*/ BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 double nVal = 0.0; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 double nVal = 0.0; //STRIP001 String aString; //STRIP001 BOOL bIsVal = TRUE; //STRIP001 diff --git a/binfilter/bf_sc/source/core/inc/interpre.hxx b/binfilter/bf_sc/source/core/inc/interpre.hxx index 4d49b7953..0580a5ccf 100644 --- a/binfilter/bf_sc/source/core/inc/interpre.hxx +++ b/binfilter/bf_sc/source/core/inc/interpre.hxx @@ -2,9 +2,9 @@ * * $RCSfile: interpre.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -474,7 +474,7 @@ void ScCalcTeam(); void ScAnswer(); void ScTTT(); void ScSpewFunc(); -void ScGame(){DBG_ASSERT(0, "STRIP");} //STRIP001 void ScGame(); +void ScGame(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void ScGame(); //----------------Funktionen in interpr2.cxx--------------- double GetDate(INT16 nYear, INT16 nMonth, INT16 nDay); diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx index 7510c7949..052d2a27c 100644 --- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_addincol.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:24 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -951,7 +951,7 @@ public: /*N*/ if ( nParamCount >= nDescCount && nDescCount > 0 && /*N*/ pArgs[nDescCount-1].eType == SC_ADDINARG_VARARGS ) /*N*/ { -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 long nVarCount = nParamCount - ( nDescCount - 1 ); // size of last argument +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 long nVarCount = nParamCount - ( nDescCount - 1 ); // size of last argument //STRIP001 aVarArg.realloc( nVarCount ); //STRIP001 bValidCount = TRUE; /*N*/ } diff --git a/binfilter/bf_sc/source/core/tool/sc_adiasync.cxx b/binfilter/bf_sc/source/core/tool/sc_adiasync.cxx index 769ae643c..191cf2e3b 100644 --- a/binfilter/bf_sc/source/core/tool/sc_adiasync.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_adiasync.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_adiasync.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,7 +133,7 @@ static ScAddInAsync aSeekObj; /*N*/ if ( nHandle ) /*N*/ { /*?*/ // im dTor wg. theAddInAsyncTbl.DeleteAndDestroy in ScGlobal::Clear -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pFuncData->Unadvice( (double)nHandle ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pFuncData->Unadvice( (double)nHandle ); //STRIP001 /*?*/ if ( eType == PTR_STRING && pStr ) // mit Typvergleich wg. Union! //STRIP001 /*?*/ delete pStr; //STRIP001 /*?*/ delete pDocs; diff --git a/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx index 03aa16ff1..3269f0834 100644 --- a/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_appoptio.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: er $ $Date: 2004-03-30 13:22:05 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -707,7 +707,7 @@ using namespace ::com::sun::star::uno; /*N*/ IMPL_LINK( ScAppCfg, LayoutCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetLayoutPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetLayoutPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); @@ -738,7 +738,7 @@ using namespace ::com::sun::star::uno; /*N*/ IMPL_LINK( ScAppCfg, InputCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetInputPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetInputPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); @@ -766,7 +766,7 @@ using namespace ::com::sun::star::uno; /*N*/ IMPL_LINK( ScAppCfg, RevisionCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetRevisionPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetRevisionPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); @@ -797,7 +797,7 @@ using namespace ::com::sun::star::uno; /*N*/ IMPL_LINK( ScAppCfg, ContentCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetContentPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetContentPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); @@ -819,7 +819,7 @@ using namespace ::com::sun::star::uno; /*N*/ IMPL_LINK( ScAppCfg, SortListCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetSortListPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetSortListPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); @@ -841,7 +841,7 @@ using namespace ::com::sun::star::uno; /*N*/ IMPL_LINK( ScAppCfg, MiscCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetMiscPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetMiscPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx index 2da0eee7b..542de44eb 100644 --- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_autoform.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -297,7 +297,7 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203; /*N*/ void ScAutoFormatDataField::SetAdjust( const SvxAdjustItem& rAdjust ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aAdjust.SetAdjust( rAdjust.GetAdjust() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aAdjust.SetAdjust( rAdjust.GetAdjust() ); //STRIP001 aAdjust.SetOneWord( rAdjust.GetOneWord() ); //STRIP001 aAdjust.SetLastBlock( rAdjust.GetLastBlock() ); /*N*/ } diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx index 96b63a231..3e48f76af 100644 --- a/binfilter/bf_sc/source/core/tool/sc_callform.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_callform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_callform.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -200,7 +200,7 @@ typedef void (CALLTYPE* FARPROC) ( void ); /*N*/ short FuncCollection::Compare(DataObject* pKey1, DataObject* pKey2) const /*N*/ { - DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 return (short) ScGlobal::pTransliteration->compareString( + DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 return (short) ScGlobal::pTransliteration->compareString( //STRIP001 ((FuncData*)pKey1)->aInternalName, ((FuncData*)pKey2)->aInternalName ); /*N*/ } @@ -238,7 +238,7 @@ typedef void (CALLTYPE* FARPROC) ( void ); /*N*/ /*N*/ virtual DataObject* Clone() const { return new ModuleCollection(*this); } /*N*/ ModuleData* operator[]( const USHORT nIndex) const {return (ModuleData*)At(nIndex);} - virtual short Compare(DataObject* pKey1, DataObject* pKey2) const{DBG_ASSERT(0, "STRIP"); return 0;} //STRIP001 virtual short Compare(DataObject* pKey1, DataObject* pKey2) const; + virtual short Compare(DataObject* pKey1, DataObject* pKey2) const{DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 virtual short Compare(DataObject* pKey1, DataObject* pKey2) const; //STRIP001 BOOL SearchModule( const String& rName, //STRIP001 const ModuleData*& rpModule ) const; /*N*/ }; diff --git a/binfilter/bf_sc/source/core/tool/sc_cellform.cxx b/binfilter/bf_sc/source/core/tool/sc_cellform.cxx index c5ac913ef..7f3e579eb 100644 --- a/binfilter/bf_sc/source/core/tool/sc_cellform.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_cellform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_cellform.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,7 +162,7 @@ const ScFormulaCell* pLastFormulaTreeTop = 0; /*N*/ USHORT nErrCode = pFCell->GetErrCode(); /*N*/ if ( nErrCode == errInterpOverflow ) /*N*/ { // maxrecursion ausbuegeln, Err527 Workaround -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pDoc = pFCell->GetDocument(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pDoc = pFCell->GetDocument(); //STRIP001 /*?*/ // z.B. nach Import von Fremdformaten FormulaTree //STRIP001 /*?*/ // aufbauen //STRIP001 /*?*/ if ( !pDoc->IsInFormulaTree( pFCell ) ) diff --git a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx index 98c6f31e0..00451e911 100644 --- a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_chartarr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,7 +122,7 @@ namespace binfilter { /*N*/ bDummyUpperLeft( FALSE ), /*N*/ bValid( TRUE ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SetRangeList( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ) ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetRangeList( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ) ); //STRIP001 /*?*/ CheckColRowHeaders(); /*N*/ } /*N*/ @@ -140,7 +140,7 @@ namespace binfilter { /*N*/ bDummyUpperLeft( FALSE ), /*N*/ bValid( TRUE ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( aRangeListRef.Is() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( aRangeListRef.Is() ) //STRIP001 /*?*/ CheckColRowHeaders(); /*N*/ } /*N*/ diff --git a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx index 00044311c..6d6e7bb27 100644 --- a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_chartlis.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -147,7 +147,7 @@ using namespace ::com::sun::star; /*N*/ DataObject* ScChartListener::Clone() const /*N*/ { - DBG_ASSERT(0, "STRIP");return NULL; //STRIP001 return new ScChartListener( *this ); + DBG_BF_ASSERT(0, "STRIP");return NULL; //STRIP001 return new ScChartListener( *this ); /*N*/ } /*N*/ void ScChartListener::SetUno( @@ -321,7 +321,7 @@ using namespace ::com::sun::star; /*N*/ DataObject* ScChartListenerCollection::Clone() const /*N*/ { - DBG_ASSERT(0, "STRIP");return NULL;//STRIP001 return new ScChartListenerCollection( *this ); + DBG_BF_ASSERT(0, "STRIP");return NULL;//STRIP001 return new ScChartListenerCollection( *this ); /*N*/ } //STRIP001 void ScChartListenerCollection::StartAllListeners() @@ -335,7 +335,7 @@ using namespace ::com::sun::star; /*N*/ void ScChartListenerCollection::ChangeListening( const String& rName, /*N*/ const ScRangeListRef& rRangeListRef, BOOL bDirty ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScChartListener aCLSearcher( rName, pDoc, rRangeListRef ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScChartListener aCLSearcher( rName, pDoc, rRangeListRef ); //STRIP001 ScChartListener* pCL; //STRIP001 USHORT nIndex; //STRIP001 if ( Search( &aCLSearcher, nIndex ) ) @@ -487,7 +487,7 @@ using namespace ::com::sun::star; /*N*/ { /*N*/ for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ]; //STRIP001 /*?*/ pCL->UpdateScheduledSeriesRanges(); /*N*/ } /*N*/ } @@ -498,7 +498,7 @@ using namespace ::com::sun::star; /*N*/ ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab ); /*N*/ for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ]; //STRIP001 /*?*/ pCL->UpdateSeriesRangesIntersecting( aRange ); /*N*/ } /*N*/ } diff --git a/binfilter/bf_sc/source/core/tool/sc_collect.cxx b/binfilter/bf_sc/source/core/tool/sc_collect.cxx index 4427189eb..ea73fd5b0 100644 --- a/binfilter/bf_sc/source/core/tool/sc_collect.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_collect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_collect.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -236,7 +236,7 @@ namespace binfilter { /*N*/ DataObject* Collection::Clone() const /*N*/ { - DBG_ASSERT(0, "STRIP"); return NULL; //STRIP001 return new Collection(*this); + DBG_BF_ASSERT(0, "STRIP"); return NULL; //STRIP001 return new Collection(*this); /*N*/ } //------------------------------------------------------------------------ @@ -348,7 +348,7 @@ namespace binfilter { /*N*/ DataObject* StrData::Clone() const /*N*/ { - DBG_ASSERT(0, "STRIP");return NULL; //STRIP001 //STRIP001 return new StrData(*this); + DBG_BF_ASSERT(0, "STRIP");return NULL; //STRIP001 //STRIP001 return new StrData(*this); /*N*/ } //------------------------------------------------------------------------ @@ -368,7 +368,7 @@ namespace binfilter { /*N*/ DataObject* StrCollection::Clone() const /*N*/ { - DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new StrCollection(*this); + DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new StrCollection(*this); /*N*/ } //------------------------------------------------------------------------ @@ -439,7 +439,7 @@ namespace binfilter { /*N*/ { /*N*/ short nResult = 0; //STRIP001 -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pKey1 && pKey2 ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pKey1 && pKey2 ) //STRIP001 { //STRIP001 TypedStrData& rData1 = (TypedStrData&)*pKey1; //STRIP001 TypedStrData& rData2 = (TypedStrData&)*pKey2; diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx index da05cb05b..56b907f66 100644 --- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_compiler.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-05-04 15:17:32 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -858,7 +858,7 @@ namespace binfilter { /*N*/ bFound = ScGlobal::GetFuncCollection()->SearchFunc(cSymbol, nIndex); /*N*/ if( bFound ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); /*N*/ ScRawToken aToken; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ ScRawToken aToken; /*N*/ /*?*/ aToken.SetExternal( cSymbol ); /*N*/ /*?*/ pRawToken = aToken.Clone(); /*N*/ } @@ -1081,7 +1081,7 @@ namespace binfilter { /*N*/ pSfxApp->LeaveBasicCall(); /*N*/ return FALSE; /*N*/ } -/*?*/ DBG_ASSERT(0, "STRIP"); /*N*/ ScRawToken aToken; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ ScRawToken aToken; /*N*/ /*?*/ aToken.SetExternal( rName.GetBuffer() ); /*N*/ /*?*/ aToken.eOp = ocMacro; /*N*/ /*?*/ pRawToken = aToken.Clone(); @@ -1654,7 +1654,7 @@ namespace binfilter { /*N*/ ScByteToken aToken( ocClose ); /*N*/ while( nBrackets-- ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); /*N*/ if( !pArr->AddToken( aToken ) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ if( !pArr->AddToken( aToken ) ) /*N*/ /*?*/ { /*N*/ /*?*/ SetError(errCodeOverflow); break; /*N*/ /*?*/ } @@ -2029,7 +2029,7 @@ namespace binfilter { /*N*/ } /*N*/ else if( pToken->GetOpCode() == ocDBArea ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); /*N*/ ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex( pToken->GetIndex() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex( pToken->GetIndex() ); /*N*/ /*?*/ if ( !pDBData ) /*N*/ /*?*/ SetError(errNoName); /*N*/ /*?*/ else if ( !bCompileForFAP ) @@ -2999,7 +2999,7 @@ namespace binfilter { /*N*/ (!rRef.Ref2.IsColRel() && !rRef.Ref2.IsRowRel() && /*N*/ (!rRef.Ref2.IsFlag3D() || !rRef.Ref2.IsTabRel())))) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); /*N*/ if (ScRefUpdate::Update( pDoc, eUpdateRefMode, aPos, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ if (ScRefUpdate::Update( pDoc, eUpdateRefMode, aPos, /*N*/ /*?*/ r, nDx, nDy, nDz, rRef ) != UR_NOTHING ) /*N*/ /*?*/ rChanged = TRUE; /*N*/ } @@ -3717,7 +3717,7 @@ namespace binfilter { /*N*/ break; /*?*/ case ocDBArea: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); /*N*/ ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex(t->GetIndex()); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex(t->GetIndex()); /*N*/ /*?*/ if (pDBData) /*N*/ /*?*/ aBuffer.append(pDBData->GetName()); /*?*/ } @@ -3734,7 +3734,7 @@ namespace binfilter { /*N*/ // show translated name of StarOne AddIns /*N*/ String aAddIn( t->GetExternal() ); /*N*/ if ( pSymbolTable != pSymbolTableEnglish ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ScGlobal::GetAddInCollection()->LocalizeString( aAddIn ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScGlobal::GetAddInCollection()->LocalizeString( aAddIn ); /*N*/ rBuffer.append(aAddIn); /*N*/ } /*N*/ break; diff --git a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx index 062a8ecc0..b63aeaf9b 100644 --- a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_consoli.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -650,7 +650,7 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTo /*N*/ if (bColByName) nArrX = pDestCols[nArrX]; /*N*/ if (nArrX != SC_CONS_NOTFOUND) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 for (nRow=nRow1; nRow<=nRow2; nRow++) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 for (nRow=nRow1; nRow<=nRow2; nRow++) //STRIP001 /*?*/ { //STRIP001 /*?*/ USHORT nArrY = nRow-nRow1; //STRIP001 /*?*/ if (bRowByName) nArrY = pDestRows[nArrY]; @@ -792,7 +792,7 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTo /*N*/ /*N*/ if (nNeeded) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDestDoc->InsertRow( 0,nTab, MAXCOL,nTab, nRow+nArrY, nNeeded ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDestDoc->InsertRow( 0,nTab, MAXCOL,nTab, nRow+nArrY, nNeeded ); //STRIP001 /*?*/ //STRIP001 /*?*/ for (nArrX=0; nArrX<nColCount; nArrX++) //STRIP001 /*?*/ if (ppUsed[nArrX][nArrY]) diff --git a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx index 2b2d7440e..11a06573e 100644 --- a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_dbcolect.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1043,7 +1043,7 @@ namespace binfilter { /*N*/ const String& rNoName = ScGlobal::GetRscString( STR_DB_NONAME ); /*N*/ /*N*/ for (USHORT i = 0; i < nCount; i++) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (((ScDBData*)pItems[i])->IsDBAtCursor(nCol, nRow, nTab, bStartOnly)) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (((ScDBData*)pItems[i])->IsDBAtCursor(nCol, nRow, nTab, bStartOnly)) //STRIP001 /*?*/ { //STRIP001 /*?*/ ScDBData* pDB = (ScDBData*)pItems[i]; //STRIP001 /*?*/ if ( pDB->GetName() == rNoName ) @@ -1060,7 +1060,7 @@ namespace binfilter { /*N*/ ScDBData* pNoNameData = NULL; /*N*/ if (pItems) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const String& rNoName = ScGlobal::GetRscString( STR_DB_NONAME ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const String& rNoName = ScGlobal::GetRscString( STR_DB_NONAME ); //STRIP001 /*?*/ //STRIP001 /*?*/ for (USHORT i = 0; i < nCount; i++) //STRIP001 /*?*/ if (((ScDBData*)pItems[i])->IsDBAtArea(nTab, nCol1, nRow1, nCol2, nRow2)) @@ -1142,7 +1142,7 @@ namespace binfilter { /*N*/ { /*N*/ for (USHORT i=0; i<nCount; i++) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT theCol1; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT theCol1; //STRIP001 /*?*/ USHORT theRow1; //STRIP001 /*?*/ USHORT theTab1; //STRIP001 /*?*/ USHORT theCol2; diff --git a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx index c66deb374..3edb6dec3 100644 --- a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_ddelink.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -183,7 +183,7 @@ namespace binfilter { /*N*/ void __EXPORT ScDdeLink::DataChanged( const String& rMimeType, /*N*/ const ::com::sun::star::uno::Any & rValue ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // wir koennen nur Strings... +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // wir koennen nur Strings... //STRIP001 if ( FORMAT_STRING != SotExchange::GetFormatIdFromMimeType( rMimeType )) //STRIP001 return; //STRIP001 diff --git a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx index 7c402a532..53e5a8107 100644 --- a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_detfunc.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 14:30:35 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -491,7 +491,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Leve /*N*/ /*N*/ BOOL bArea = ( nRefStartCol != nRefEndCol || nRefStartRow != nRefEndRow ); /*N*/ if (bArea && !bFromOtherTab) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // insert the rectangle before the arrow - this is relied on in FindFrameForObject //STRIP001 /*N*/ //STRIP001 /*N*/ Point aStartCorner = GetDrawPos( nRefStartCol, nRefStartRow, FALSE ); @@ -1602,7 +1602,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Leve /*N*/ BOOL bFound = pDoc->GetNote( nCol, nRow, nTab, aNote ); /*N*/ if ( bFound || bForce || rUserText.Len() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 SdrModel* pDestModel = pModel; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SdrModel* pDestModel = pModel; //STRIP001 if ( pDestPage ) //STRIP001 pDestModel = pDestPage->GetModel(); //STRIP001 ScCommentData aData( pDoc, pDestModel ); // richtigen Pool benutzen @@ -1875,7 +1875,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Leve /*N*/ const ScAddress& rPosition, const ScRange& rSource, /*N*/ BOOL bRedLine ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 ScDrawLayer* pModel = pDoc->GetDrawLayer(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDrawLayer* pModel = pDoc->GetDrawLayer(); //STRIP001 if (!pModel) return; //STRIP001 ScDetectiveData aData( pModel ); //STRIP001 diff --git a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx index b69c6c59d..afcab157c 100644 --- a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_docoptio.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:29 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -467,7 +467,7 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } /*N*/ IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetCalcPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetCalcPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); @@ -525,7 +525,7 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } /*N*/ IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetLayoutPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetLayoutPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); diff --git a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx index 7b3a089b2..da1c5292e 100644 --- a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_editutil.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:14 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -665,12 +665,12 @@ const sal_Char __FAR_DATA ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>"; /*N*/ { /*?*/ case SVX_CHARS_UPPER_LETTER: /*?*/ case SVX_CHARS_LOWER_LETTER: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aTmpStr = lcl_GetCharStr( nNo ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aTmpStr = lcl_GetCharStr( nNo ); /*?*/ break; /*?*/ /*?*/ case SVX_ROMAN_UPPER: /*?*/ case SVX_ROMAN_LOWER: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aTmpStr = lcl_GetRomanStr( nNo ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aTmpStr = lcl_GetRomanStr( nNo ); /*?*/ break; /*?*/ /*?*/ case SVX_NUMBER_NONE: diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx index 3974f3186..94e261888 100644 --- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_interpr4.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:31 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2550,7 +2550,7 @@ void ScInterpreter::ScCalcTeam() static BOOL bShown = FALSE; if( !bShown ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 ShowTheTeam(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ShowTheTeam(); /*N*/ String aTeam( RTL_CONSTASCII_USTRINGPARAM( "Ballach, Nebel, Rentz, Rathke, Marmion" ) ); /*N*/ if ( (GetByte() == 1) && ::rtl::math::approxEqual( GetDouble(), 1996) ) /*N*/ /*?*/ aTeam.AppendAscii( " (a word with 'B': -Olk, -Nietsch, -Daeumling)" ); diff --git a/binfilter/bf_sc/source/core/tool/sc_printopt.cxx b/binfilter/bf_sc/source/core/tool/sc_printopt.cxx index b4667bea6..96b177be8 100644 --- a/binfilter/bf_sc/source/core/tool/sc_printopt.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_printopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_printopt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:33 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -187,7 +187,7 @@ using namespace ::com::sun::star::uno; /*N*/ ScPrintCfg::ScPrintCfg() : /*N*/ ConfigItem( OUString::createFromAscii( CFGPATH_PRINT ) ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetPropertyNames(); //STRIP001 Sequence<Any> aValues = GetProperties(aNames); //STRIP001 // EnableNotification(aNames); //STRIP001 const Any* pValues = aValues.getConstArray(); diff --git a/binfilter/bf_sc/source/core/tool/sc_progress.cxx b/binfilter/bf_sc/source/core/tool/sc_progress.cxx index f8de5dd21..07626a245 100644 --- a/binfilter/bf_sc/source/core/tool/sc_progress.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_progress.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_progress.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:33 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,7 +120,7 @@ BOOL ScProgress::bIdleWasDisabled = FALSE; /*N*/ /*N*/ if ( pGlobalProgress || SfxProgress::GetActiveProgress( NULL ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( lcl_IsHiddenDocument(pObjSh) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( lcl_IsHiddenDocument(pObjSh) ) //STRIP001 /*?*/ { //STRIP001 /*?*/ // loading a hidden document while a progress is active is possible - no error //STRIP001 /*?*/ pProgress = NULL; diff --git a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx index bbafaab67..874e0a3e0 100644 --- a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_rangenam.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-27 18:54:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -652,7 +652,7 @@ namespace binfilter { /*N*/ { /*N*/ if ( p->GetOpCode() == ocName ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nIndex = p->GetIndex(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nIndex = p->GetIndex(); //STRIP001 /*?*/ USHORT nNewIndex = rMap.Find( nIndex ); //STRIP001 /*?*/ if ( nIndex != nNewIndex ) //STRIP001 /*?*/ { @@ -928,7 +928,7 @@ namespace binfilter { /*N*/ void ScRangeName::UpdateTabRef(USHORT nOldTable, USHORT nFlag, USHORT nNewTable) /*N*/ { /*N*/ for (USHORT i=0; i<nCount; i++) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((ScRangeData*)pItems[i])->UpdateTabRef(nOldTable, nFlag, nNewTable); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((ScRangeData*)pItems[i])->UpdateTabRef(nOldTable, nFlag, nNewTable); /*N*/ } diff --git a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx index 4cca32ffb..6b7a9121a 100644 --- a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_rangeutl.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: er $ $Date: 2004-03-30 13:22:06 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -324,7 +324,7 @@ namespace binfilter { /*N*/ } /*N*/ else /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 CutPosString( aStrArea, aStrArea ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 CutPosString( aStrArea, aStrArea ); //STRIP001 /*?*/ //STRIP001 /*?*/ if ( IsAbsPos( aStrArea, pDoc, nCurTab, //STRIP001 /*?*/ NULL, &aStartPos ) ) diff --git a/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx b/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx index abbc5fdea..fe8f4808b 100644 --- a/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_refreshtimer.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:35 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,7 +92,7 @@ namespace binfilter { /*N*/ void ScRefreshTimer::SetRefreshDelay( ULONG nSeconds ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bActive = IsActive(); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bActive = IsActive(); //STRIP001 if ( bActive && !nSeconds ) //STRIP001 Stop(); //STRIP001 SetTimeout( nSeconds * 1000 ); diff --git a/binfilter/bf_sc/source/core/tool/sc_refupdat.cxx b/binfilter/bf_sc/source/core/tool/sc_refupdat.cxx index 910b8fc03..fb6b9e42c 100644 --- a/binfilter/bf_sc/source/core/tool/sc_refupdat.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_refupdat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_refupdat.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:36 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -372,7 +372,7 @@ namespace binfilter { /*N*/ } /*N*/ else if (eUpdateRefMode == URM_MOVE) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ((theCol1 >= nCol1-nDx) && (theRow1 >= nRow1-nDy) && (theTab1 >= nTab1-nDz) && +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ((theCol1 >= nCol1-nDx) && (theRow1 >= nRow1-nDy) && (theTab1 >= nTab1-nDz) && //STRIP001 /*?*/ (theCol2 <= nCol2-nDx) && (theRow2 <= nRow2-nDy) && (theTab2 <= nTab2-nDz)) //STRIP001 /*?*/ { //STRIP001 /*?*/ if ( nDx ) @@ -402,7 +402,7 @@ namespace binfilter { /*N*/ else if (eUpdateRefMode == URM_REORDER) /*N*/ { /*?*/ // bisher nur fuer nDz (MoveTab) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT ( !nDx && !nDy, "URM_REORDER fuer x und y noch nicht implementiert" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT ( !nDx && !nDy, "URM_REORDER fuer x und y noch nicht implementiert" ); //STRIP001 /*?*/ //STRIP001 /*?*/ if ( nDz && (theCol1 >= nCol1) && (theCol2 <= nCol2) && //STRIP001 /*?*/ (theRow1 >= nRow1) && (theRow2 <= nRow2) ) diff --git a/binfilter/bf_sc/source/core/tool/sc_token.cxx b/binfilter/bf_sc/source/core/tool/sc_token.cxx index 249b4cac5..1ecc2c3c9 100644 --- a/binfilter/bf_sc/source/core/tool/sc_token.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_token.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_token.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:37 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -720,7 +720,7 @@ namespace binfilter { /*N*/ ScToken* ScFAPToken::GetFAPOrigToken() const { return pOrigToken; } /*N*/ BOOL ScFAPToken::operator==( const ScToken& r ) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;/*N*/ return ScToken::operator==( r ) && pOrigToken == r.GetFAPOrigToken(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;/*N*/ return ScToken::operator==( r ) && pOrigToken == r.GetFAPOrigToken(); /*N*/ } diff --git a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx index caebcc3a0..879b33b0f 100644 --- a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx +++ b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_viewopti.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:26:38 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -743,7 +743,7 @@ using namespace ::com::sun::star::uno; /*N*/ IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetLayoutPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetLayoutPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); @@ -796,7 +796,7 @@ using namespace ::com::sun::star::uno; /*N*/ IMPL_LINK( ScViewCfg, DisplayCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetDisplayPropertyNames(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Sequence<OUString> aNames = GetDisplayPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); //STRIP001 Any* pValues = aValues.getArray(); @@ -842,7 +842,7 @@ using namespace ::com::sun::star::uno; /*N*/ IMPL_LINK( ScViewCfg, GridCommitHdl, void *, EMPTYARG ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 const ScGridOptions& rGrid = GetGridOptions(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const ScGridOptions& rGrid = GetGridOptions(); //STRIP001 //STRIP001 Sequence<OUString> aNames = GetGridPropertyNames(); //STRIP001 OUString* pNames = aNames.getArray(); diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx index f34a8b386..7794de111 100644 --- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx +++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_sclib.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:28:45 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -375,7 +375,7 @@ USHORT ScModuleDummy::HasID(const SvGlobalName& rName) BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 if ( !pFilter ) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( !pFilter ) return FALSE; //STRIP001 //STRIP001 // TRUE for XML file or template diff --git a/binfilter/bf_sc/source/ui/app/sc_scmod.cxx b/binfilter/bf_sc/source/ui/app/sc_scmod.cxx index 2cc417623..4f6efbe5f 100644 --- a/binfilter/bf_sc/source/ui/app/sc_scmod.cxx +++ b/binfilter/bf_sc/source/ui/app/sc_scmod.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_scmod.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:28:45 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -257,7 +257,7 @@ static USHORT nIdleCount = 0; /*N*/ { //STRIP001 /*?*/ // Test if detective objects have to be updated with new colors //STRIP001 /*?*/ // (if the detective colors haven't been used yet, there's nothing to update) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( ScDetectiveFunc::IsColorsInitialized() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( ScDetectiveFunc::IsColorsInitialized() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ const svtools::ColorConfig& rColors = GetColorConfig(); //STRIP001 /*?*/ BOOL bArrows = @@ -314,7 +314,7 @@ static USHORT nIdleCount = 0; //STRIP001 /*?*/ } /*N*/ } /*N*/ else if ( nHintId == SFX_HINT_CTL_SETTINGS_CHANGED ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // for all documents: set digit language for printer, recalc output factor, update row heights //STRIP001 SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); //STRIP001 while ( pObjSh ) @@ -822,7 +822,7 @@ static USHORT nIdleCount = 0; /*N*/ ScDocument* ScModule::GetClipDoc() /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // called from document +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // called from document //STRIP001 //STRIP001 ScTransferObj* pObj = ScTransferObj::GetOwnClipboard( NULL ); //STRIP001 if (pObj) @@ -931,7 +931,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // called from document /*N*/ SfxViewFrame* pViewFrm = SfxViewFrame::Current(); /*N*/ if ( pViewFrm && pViewFrm->HasChildWindow(nFuncListID) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScFunctionChildWindow* pWnd =(ScFunctionChildWindow*)pViewFrm->GetChildWindow( nFuncListID ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScFunctionChildWindow* pWnd =(ScFunctionChildWindow*)pViewFrm->GetChildWindow( nFuncListID ); /*?*/ //STRIP001 /*?*/ ScFunctionDockWin* pFuncList=(ScFunctionDockWin*)pWnd->GetWindow(); //STRIP001 /*?*/ @@ -1818,7 +1818,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // called from document /*N*/ /*N*/ if ( nCurRefDlgId ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( nCurRefDlgId ); //STRIP001 /*?*/ if ( pChildWnd ) //STRIP001 /*?*/ { //STRIP001 /*?*/ ScAnyRefDlg* pRefDlg = (ScAnyRefDlg*)pChildWnd->GetWindow(); @@ -1960,7 +1960,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // called from document void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); //STRIP001 while ( pFrame ) //STRIP001 { //STRIP001 SfxViewShell* p = pFrame->GetViewShell(); @@ -1986,7 +1986,7 @@ void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) /*?*/ ScDocument* pDoc = pDocSh->GetDocument(); /*?*/ if ( pDoc->IsLoadingDone() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bLinks = pDoc->IdleCheckLinks(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bLinks = pDoc->IdleCheckLinks(); //STRIP001 /*?*/ BOOL bWidth = pDoc->IdleCalcTextWidth(); //STRIP001 /*?*/ BOOL bSpell = pDoc->ContinueOnlineSpelling(); //STRIP001 /*?*/ if ( bSpell ) @@ -2030,7 +2030,7 @@ void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) IMPL_LINK( ScModule, SpellTimerHdl, Timer*, pTimer ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( Application::AnyInput( INPUT_KEYBOARD ) ) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( Application::AnyInput( INPUT_KEYBOARD ) ) //STRIP001 { //STRIP001 aSpellTimer.Start(); //STRIP001 return 0; // dann spaeter wieder... @@ -2172,7 +2172,7 @@ IMPL_LINK( ScModule, SpellTimerHdl, Timer*, pTimer ) /*N*/ { //STRIP001 //! mit ScFieldEditEngine zusammenfassen !!! //STRIP001 -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (pInfo) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (pInfo) //STRIP001 { //STRIP001 const SvxFieldItem& rField = pInfo->GetField(); //STRIP001 const SvxFieldData* pField = rField.GetField(); diff --git a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx b/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx index 0b61abfbe..0a06ac3c3 100644 --- a/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx +++ b/binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_asciiopt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:28:54 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -487,7 +487,7 @@ static const sal_Char __FAR_DATA pStrMrg[] = "MRG"; void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 xub_StrLen i; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 xub_StrLen i; //STRIP001 xub_StrLen nCount = rList.GetTokenCount('\t'); //STRIP001 for ( i=0; i<nCount; i+=2 ) //STRIP001 rCombo.InsertEntry( rList.GetToken(i,'\t') ); @@ -508,7 +508,7 @@ void lcl_FillCombo( ComboBox& rCombo, const String& rList, sal_Unicode cSelect ) sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const String& rList ) { sal_Unicode c = 0; - DBG_ASSERT(0, "STRIP"); //STRIP001 String aStr = rCombo.GetText(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 String aStr = rCombo.GetText(); //STRIP001 if ( aStr.Len() ) //STRIP001 { //STRIP001 xub_StrLen nCount = rList.GetTokenCount('\t'); diff --git a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx index fb34896e1..87a4de426 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_arealink.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:04 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,7 +149,7 @@ namespace binfilter { /*N*/ void __EXPORT ScAreaLink::DataChanged( const String&, /*N*/ const ::com::sun::star::uno::Any& ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ // bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ // bei bInCreate nichts tun, damit Update gerufen werden kann, um den Status im //STRIP001 // LinkManager zu setzen, ohne die Daten im Dokument zu aendern //STRIP001 //STRIP001 if (bInCreate) @@ -306,7 +306,7 @@ namespace binfilter { /*N*/ String aTempArea; /*N*/ /*N*/ if( rNewFilter == ScDocShell::GetWebQueryFilterName() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ aTempArea = ScHTMLImport::GetHTMLRangeNameList( pSrcDoc, rNewArea ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ aTempArea = ScHTMLImport::GetHTMLRangeNameList( pSrcDoc, rNewArea ); /*N*/ else /*N*/ aTempArea = rNewArea; /*N*/ @@ -446,7 +446,7 @@ namespace binfilter { /*N*/ /*N*/ if ( bAddUndo && bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); //STRIP001 /*?*/ pRedoDoc->InitUndo( pDoc, nDestTab, nDestTab ); //STRIP001 /*?*/ pDoc->CopyToDocument( aNewRange, IDF_ALL, FALSE, pRedoDoc ); //STRIP001 /*?*/ @@ -474,7 +474,7 @@ namespace binfilter { /*N*/ aDestArea = aNewRange; /*N*/ /*N*/ if ( nNewRefresh != GetRefreshDelay() ) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SetRefreshDelay( nNewRefresh ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetRefreshDelay( nNewRefresh ); /*N*/ /*N*/ USHORT nPaintEndX = Max( aOldRange.aEnd.Col(), aNewRange.aEnd.Col() ); /*N*/ USHORT nPaintEndY = Max( aOldRange.aEnd.Row(), aNewRange.aEnd.Row() ); @@ -523,7 +523,7 @@ namespace binfilter { /*N*/ IMPL_LINK( ScAreaLink, RefreshHdl, ScAreaLink*, pCaller ) /*N*/ { - DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 long nRes = Refresh( aFileName, aFilterName, aSourceArea, + DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 long nRes = Refresh( aFileName, aFilterName, aSourceArea, //STRIP001 GetRefreshDelay() ) != 0; //STRIP001 return nRes; /*N*/ } diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx index 4ac6657c5..5c97a7797 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_dbdocfun.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:05 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -153,7 +153,7 @@ namespace binfilter { /*N*/ /*N*/ if (bUndo) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDBCollection* pRedoColl = new ScDBCollection( *pDocColl ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDBCollection* pRedoColl = new ScDBCollection( *pDocColl ); //STRIP001 /*?*/ rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoDBData( &rDocShell, pUndoColl, pRedoColl ) ); /*N*/ } @@ -191,7 +191,7 @@ namespace binfilter { /*N*/ BOOL bInserted = pDocColl->Insert( pNewData ); /*N*/ if (!bInserted) // Fehler -> alten Zustand wiederherstellen /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete pNewData; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete pNewData; //STRIP001 /*?*/ pDoc->SetDBCollection( pUndoColl ); // gehoert dann dem Dokument /*N*/ } /*N*/ pDoc->CompileDBFormula( FALSE ); // CompileFormulaString @@ -200,7 +200,7 @@ namespace binfilter { /*N*/ { /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDBCollection* pRedoColl = new ScDBCollection( *pDocColl ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDBCollection* pRedoColl = new ScDBCollection( *pDocColl ); //STRIP001 /*?*/ rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoDBData( &rDocShell, pUndoColl, pRedoColl ) ); /*N*/ } @@ -322,7 +322,7 @@ namespace binfilter { /*N*/ ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab ); /*N*/ if (pTable) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pUndoTab = new ScOutlineTable( *pTable ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pUndoTab = new ScOutlineTable( *pTable ); //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nOutStartCol; // Zeilen/Spaltenstatus //STRIP001 /*?*/ USHORT nOutStartRow; @@ -388,7 +388,7 @@ namespace binfilter { /*N*/ /*N*/ if (bRecord) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nDummy; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nDummy; //STRIP001 /*?*/ USHORT nNewEndRow; //STRIP001 /*?*/ pDBData->GetArea( nDummy, nDummy,nDummy, nDummy,nNewEndRow ); //STRIP001 /*?*/ @@ -457,7 +457,7 @@ namespace binfilter { /*N*/ ScSortParam aLocalParam( rSortParam ); /*N*/ if ( bCopy ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aLocalParam.MoveToDest(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aLocalParam.MoveToDest(); //STRIP001 /*?*/ nTab = rSortParam.nDestTab; //STRIP001 /*?*/ pDestData = pDoc->GetDBAtCursor( rSortParam.nDestCol, rSortParam.nDestRow, //STRIP001 /*?*/ rSortParam.nDestTab, TRUE ); @@ -509,7 +509,7 @@ namespace binfilter { /*N*/ { /*?*/ // Referenzen ausserhalb des Bereichs werden nicht veraendert ! /*?*/ -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); //STRIP001 /*?*/ // Zeilenhoehen immer (wegen automatischer Anpassung) //STRIP001 /*?*/ //! auf ScBlockUndo umstellen //STRIP001 /*?*/ pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE ); @@ -689,7 +689,7 @@ namespace binfilter { /*N*/ USHORT nDestTab = nTab; /*N*/ if ( bCopy ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aLocalParam.MoveToDest(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aLocalParam.MoveToDest(); //STRIP001 /*?*/ nDestTab = rQueryParam.nDestTab; //STRIP001 /*?*/ //STRIP001 /*?*/ ScEditableTester aTester( pDoc, nDestTab, aLocalParam.nCol1,aLocalParam.nRow1, @@ -751,7 +751,7 @@ namespace binfilter { /*N*/ /*N*/ if ( bRecord ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const ScRange* pOld = 0; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const ScRange* pOld = 0; //STRIP001 /*?*/ ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); //STRIP001 /*?*/ if (bCopy) //STRIP001 /*?*/ { @@ -992,7 +992,7 @@ namespace binfilter { /*N*/ BOOL bOk = TRUE; /*N*/ BOOL bDelete = FALSE; /*N*/ if (rParam.bReplace) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 if (pDoc->TestRemoveSubTotals( nTab, rParam )) +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 if (pDoc->TestRemoveSubTotals( nTab, rParam )) //STRIP001 /*?*/ { //STRIP001 /*?*/ bDelete = TRUE; //STRIP001 /*?*/ bOk = ( MessBox( rDocShell.GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), @@ -1023,7 +1023,7 @@ namespace binfilter { /*N*/ ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab ); /*N*/ if (pTable) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pUndoTab = new ScOutlineTable( *pTable ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pUndoTab = new ScOutlineTable( *pTable ); //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nOutStartCol; // Zeilen/Spaltenstatus //STRIP001 /*?*/ USHORT nOutStartRow; @@ -1059,15 +1059,15 @@ namespace binfilter { /*N*/ // pDoc->SetOutlineTable( nTab, NULL ); /*N*/ ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab ); /*N*/ if (pOut) -/*?*/ { DBG_ASSERT(0, "STRIP"); }//STRIP001 pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen +/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen /*N*/ /*N*/ if (rParam.bReplace) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pDoc->RemoveSubTotals( nTab, aNewParam ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pDoc->RemoveSubTotals( nTab, aNewParam ); /*N*/ BOOL bSuccess = TRUE; /*N*/ if (bDo) /*N*/ { /*?*/ // Sortieren -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( rParam.bDoSort || pForceNewSort ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( rParam.bDoSort || pForceNewSort ) //STRIP001 /*?*/ { //STRIP001 /*?*/ pDBData->SetArea( nTab, aNewParam.nCol1,aNewParam.nRow1, aNewParam.nCol2,aNewParam.nRow2 ); //STRIP001 /*?*/ @@ -1089,7 +1089,7 @@ namespace binfilter { /*N*/ if (bRecord) /*N*/ { /*N*/ // ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL; -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoSubTotals( &rDocShell, nTab, //STRIP001 /*?*/ rParam, aNewParam.nRow2, //STRIP001 /*?*/ pUndoDoc, pUndoTab, // pUndoDBData, @@ -1229,7 +1229,7 @@ namespace binfilter { /*N*/ } /*N*/ else /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pNewObj->WriteSourceDataTo( *pOldObj ); // copy source data +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pNewObj->WriteSourceDataTo( *pOldObj ); // copy source data //STRIP001 /*?*/ //STRIP001 /*?*/ ScDPSaveData* pData = pNewObj->GetSaveData(); //STRIP001 /*?*/ DBG_ASSERT( pData, "no SaveData from living DPObject" ); @@ -1256,7 +1256,7 @@ namespace binfilter { /*N*/ // #78541# create new database connection for "refresh" /*N*/ // (and re-read column entry collections) /*N*/ // so all changes take effect -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pNewObj == pOldObj && pDestObj->IsImportData() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pNewObj == pOldObj && pDestObj->IsImportData() ) //STRIP001 /*?*/ pDestObj->InvalidateSource(); //STRIP001 /*?*/ //STRIP001 /*?*/ pDestObj->InvalidateData(); // before getting the new output area @@ -1335,7 +1335,7 @@ namespace binfilter { /*N*/ /*N*/ if ( bRecord && bDone ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxUndoAction* pAction = new ScUndoDataPilot( &rDocShell, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxUndoAction* pAction = new ScUndoDataPilot( &rDocShell, //STRIP001 /*?*/ pOldUndoDoc, pNewUndoDoc, pUndoDPObj, pDestObj ); //STRIP001 /*?*/ pOldUndoDoc = NULL; //STRIP001 /*?*/ pNewUndoDoc = NULL; // pointers are used in undo action @@ -1427,7 +1427,7 @@ namespace binfilter { /*M*/ { /*M*/ // interne Operationen, wenn welche gespeichert /*M*/ -/*M*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pData->HasQueryParam() || pData->HasSortParam() || pData->HasSubTotalParam() ) +/*M*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pData->HasQueryParam() || pData->HasSortParam() || pData->HasSubTotalParam() ) //STRIP001 /*M*/ pViewSh->RepeatDB(); //STRIP001 /*M*/ //STRIP001 /*M*/ // Pivottabellen die den Bereich als Quelldaten haben diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx index 2b5289633..b72f702ea 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_dbdocimp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:05 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -455,7 +455,7 @@ using namespace ::com::sun::star; /*M*/ /*M*/ ++nInserted; /*M*/ if (!(nInserted & 15)) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*M*/ String aPict = ScGlobal::GetRscString( STR_PROGRESS_IMPORT ); //STRIP001 /*M*/ String aText = aPict.GetToken(0,'#'); //STRIP001 /*M*/ aText += String::CreateFromInt32( nInserted ); @@ -690,7 +690,7 @@ using namespace ::com::sun::star; /*M*/ /*M*/ if( !bAddrInsert ) // update database range /*M*/ { -/*M*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDBData->SetImportParam( rParam ); +/*M*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDBData->SetImportParam( rParam ); //STRIP001 /*M*/ pDBData->SetHeader( TRUE ); //STRIP001 /*M*/ pDBData->SetByRow( TRUE ); //STRIP001 /*M*/ pDBData->SetArea( nTab, rParam.nCol1,rParam.nRow1, nEndCol,nEndRow ); @@ -700,7 +700,7 @@ using namespace ::com::sun::star; /*M*/ /*M*/ if (bRecord) /*M*/ { -/*M*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pRedoDoc = pImportDoc; +/*M*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pRedoDoc = pImportDoc; //STRIP001 /*M*/ pImportDoc = NULL; //STRIP001 /*M*/ //STRIP001 /*M*/ if (nFormulaCols) // include filled formulas for redo diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx index 428fca1bd..e8e9efc7d 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_docfunc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:05 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,7 +134,7 @@ using namespace ::com::sun::star; /*N*/ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SfxUndoAction*, pUndoAction ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDraw( pUndoAction, &rDocShell ) ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( new ScUndoDraw( pUndoAction, &rDocShell ) ); //STRIP001 rDocShell.SetDrawModified(); /*N*/ return 0; /*N*/ } @@ -209,7 +209,7 @@ using namespace ::com::sun::star; /*N*/ pDoc->AddDetectiveOperation( aOperation ); /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoDetective( &rDocShell, pUndo, &aOperation ) ); /*N*/ } /*N*/ aModificator.SetDocumentModified(); @@ -250,7 +250,7 @@ using namespace ::com::sun::star; /*N*/ pDoc->AddDetectiveOperation( aOperation ); /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoDetective( &rDocShell, pUndo, &aOperation ) ); /*N*/ } /*N*/ aModificator.SetDocumentModified(); @@ -266,7 +266,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocFunc::DetectiveAddSucc(const ScAddress& rPos) /*N*/ { - DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 ScDocShellModificator aModificator( rDocShell ); + DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 ScDocShellModificator aModificator( rDocShell ); //STRIP001 //STRIP001 rDocShell.MakeDrawLayer(); //STRIP001 ScDocument* pDoc = rDocShell.GetDocument(); @@ -330,7 +330,7 @@ using namespace ::com::sun::star; /*N*/ pDoc->AddDetectiveOperation( aOperation ); /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoDetective( &rDocShell, pUndo, &aOperation ) ); /*N*/ } /*N*/ aModificator.SetDocumentModified(); @@ -369,7 +369,7 @@ using namespace ::com::sun::star; /*N*/ pDoc->AddDetectiveOperation( aOperation ); /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoDetective( &rDocShell, pUndo, &aOperation ) ); /*N*/ } /*N*/ aModificator.SetDocumentModified(); @@ -409,7 +409,7 @@ using namespace ::com::sun::star; /*N*/ { /*N*/ if (pUndo && bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pUndo->SetComment( ScGlobal::GetRscString( STR_UNDO_DETINVALID ) ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pUndo->SetComment( ScGlobal::GetRscString( STR_UNDO_DETINVALID ) ); //STRIP001 /*N*/ rDocShell.GetUndoManager()->AddUndoAction( pUndo ); /*N*/ } /*N*/ aModificator.SetDocumentModified(); @@ -453,7 +453,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoDetective( &rDocShell, pUndo, NULL, pUndoList ) ); /*N*/ } /*N*/ aModificator.SetDocumentModified(); @@ -610,7 +610,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ if (bObjects) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (bRecord) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (bRecord) //STRIP001 /*?*/ pDoc->BeginDrawUndo(); //STRIP001 /*?*/ //STRIP001 /*?*/ if (bMulti) @@ -623,7 +623,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ if ( bRecord ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); //STRIP001 /*?*/ pUndoDoc->InitUndo( pDoc, aMarkRange.aStart.Tab(), aMarkRange.aEnd.Tab() ); //STRIP001 /*?*/ //STRIP001 /*?*/ // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument @@ -648,14 +648,14 @@ using namespace ::com::sun::star; /*N*/ aMultiMark, nFlags ); /*N*/ else /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDoc->DeleteSelection( nFlags, aMultiMark ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDoc->DeleteSelection( nFlags, aMultiMark ); //STRIP001 /*?*/ aMultiMark.MarkToSimple(); /*N*/ } /*N*/ /*N*/ if (!AdjustRowHeight( aExtendedRange )) /*N*/ rDocShell.PostPaint( aExtendedRange, PAINT_GRID, nExtFlags ); /*N*/ else if (nExtFlags & SC_PF_LINES) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 lcl_PaintAbove( rDocShell, aExtendedRange ); // fuer Linien ueber dem Bereich +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 lcl_PaintAbove( rDocShell, aExtendedRange ); // fuer Linien ueber dem Bereich /*N*/ /*N*/ // rDocShell.UpdateOle(GetViewData()); //! an der View? /*N*/ aModificator.SetDocumentModified(); @@ -778,7 +778,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // wegen ChangeTracking darf UndoAction erst nach SetString angelegt werden +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // wegen ChangeTracking darf UndoAction erst nach SetString angelegt werden //STRIP001 /*?*/ rDocShell.GetUndoManager()->AddUndoAction(new ScUndoEnterData( &rDocShell, rPos.Col(),rPos.Row(),rPos.Tab(), 1,pTabs, //STRIP001 /*?*/ ppOldCells, pHasFormat, pOldFormats, rText, NULL ) ); /*N*/ } @@ -1221,7 +1221,7 @@ using namespace ::com::sun::star; /*N*/ if (!AdjustRowHeight( aMultiRange )) /*N*/ rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags ); /*N*/ else if (nExtFlags & SC_PF_LINES) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 lcl_PaintAbove( rDocShell, aMultiRange ); // fuer Linien ueber dem Bereich /*N*/ /*N*/ aModificator.SetDocumentModified(); /*N*/ @@ -1233,7 +1233,7 @@ using namespace ::com::sun::star; /*M*/ BOOL ScDocFunc::InsertCells( const ScRange& rRange, InsCellCmd eCmd, /*N*/ BOOL bRecord, BOOL bApi, BOOL bPartOfPaste ) /*M*/ { -/*M*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ScDocShellModificator aModificator( rDocShell ); +/*M*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ScDocShellModificator aModificator( rDocShell ); //STRIP001 //STRIP001 USHORT nStartCol = rRange.aStart.Col(); //STRIP001 USHORT nStartRow = rRange.aStart.Row(); @@ -1451,7 +1451,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, DelCellCmd eCmd, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nStartCol = rRange.aStart.Col(); //STRIP001 /*?*/ USHORT nStartRow = rRange.aStart.Row(); @@ -1697,7 +1697,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, /*N*/ BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nStartCol = rSource.aStart.Col(); //STRIP001 /*?*/ USHORT nStartRow = rSource.aStart.Row(); @@ -2079,7 +2079,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocFunc::DeleteTable( USHORT nTab, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 WaitObject aWait( rDocShell.GetDialogParent() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 WaitObject aWait( rDocShell.GetDialogParent() ); //STRIP001 /*?*/ //STRIP001 /*?*/ ScDocShellModificator aModificator( rDocShell ); //STRIP001 /*?*/ @@ -2432,7 +2432,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos, /*N*/ BOOL bRecord, BOOL bSetModified, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); //STRIP001 /*?*/ //STRIP001 /*?*/ ScDocument* pDoc = rDocShell.GetDocument(); //STRIP001 /*?*/ if (bRecord && !pDoc->IsUndoEnabled()) @@ -2503,12 +2503,12 @@ using namespace ::com::sun::star; /*N*/ return FALSE; // kein Umbruch gesetzt /*N*/ /*?*/ if (bRecord) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoPageBreak( &rDocShell, rPos.Col(), rPos.Row(), nTab, bColumn, FALSE ) ); /*?*/ /*?*/ nFlags &= ~CR_MANUALBREAK; /*?*/ if (bColumn) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pDoc->SetColFlags( nPos, nTab, nFlags ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pDoc->SetColFlags( nPos, nTab, nFlags ); /*?*/ else /*?*/ pDoc->SetRowFlags( nPos, nTab, nFlags ); /*?*/ pDoc->UpdatePageBreaks( nTab ); @@ -2579,7 +2579,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoProtect( &rDocShell, nTab, TRUE, aPass ) ); /*N*/ } /*N*/ @@ -2623,7 +2623,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoProtect( &rDocShell, nTab, FALSE, aOldPassword ) ); /*N*/ } /*N*/ @@ -2670,7 +2670,7 @@ using namespace ::com::sun::star; /*N*/ // if (bRecord) /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nStartTab = aMarkRange.aStart.Tab(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nStartTab = aMarkRange.aStart.Tab(); //STRIP001 /*?*/ USHORT nEndTab = aMarkRange.aEnd.Tab(); //STRIP001 /*?*/ //STRIP001 /*?*/ ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); @@ -2711,7 +2711,7 @@ using namespace ::com::sun::star; /*N*/ // if (bRecord) /*N*/ if (bUndo) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nStartTab = aMarkRange.aStart.Tab(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nStartTab = aMarkRange.aStart.Tab(); //STRIP001 /*?*/ USHORT nTabCount = pDoc->GetTableCount(); //STRIP001 /*?*/ //STRIP001 /*?*/ ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); @@ -2844,7 +2844,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ if ( bRecord ) // Draw-Undo erst jetzt verfuegbar /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( //STRIP001 /*?*/ new ScUndoAutoFormat( &rDocShell, rRange, pUndoDoc, aMark, bSize, nFormatNo ) ); /*N*/ } /*N*/ @@ -2941,7 +2941,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, /*N*/ const ScTabOpParam& rParam, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 ScDocShellModificator aModificator( rDocShell ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 ScDocShellModificator aModificator( rDocShell ); //STRIP001 /*?*/ //STRIP001 /*?*/ BOOL bSuccess = FALSE; //STRIP001 /*?*/ ScDocument* pDoc = rDocShell.GetDocument(); @@ -3115,7 +3115,7 @@ using namespace ::com::sun::star; /*N*/ double fStart, double fStep, double fMax, /*N*/ BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ScDocShellModificator aModificator( rDocShell ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ScDocShellModificator aModificator( rDocShell ); //STRIP001 /*?*/ //STRIP001 /*?*/ BOOL bSuccess = FALSE; //STRIP001 /*?*/ ScDocument* pDoc = rDocShell.GetDocument(); @@ -3232,7 +3232,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, /*N*/ FillDir eDir, USHORT nCount, BOOL bRecord, BOOL bApi ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); //STRIP001 //STRIP001 ScDocument* pDoc = rDocShell.GetDocument(); //STRIP001 USHORT nStartCol = rRange.aStart.Col(); @@ -3414,7 +3414,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ /*N*/ if (bNeedContents && bContents) -/*?*/ { DBG_ASSERT(0, "STRIP");} //STRIP001 pDoc->DoMergeContents( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); +/*?*/ { DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pDoc->DoMergeContents( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); /*N*/ pDoc->DoMerge( nTab, nStartCol,nStartRow, nEndCol,nEndRow ); /*N*/ /*N*/ if ( !AdjustRowHeight( ScRange( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab ) ) ) @@ -3436,7 +3436,7 @@ using namespace ::com::sun::star; /*N*/ BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell ); //STRIP001 /*?*/ //STRIP001 /*?*/ ScDocument* pDoc = rDocShell.GetDocument(); //STRIP001 /*?*/ USHORT nTab = rRange.aStart.Tab(); @@ -3782,7 +3782,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ if (bRecord) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); //STRIP001 /*?*/ pRedoDoc->InitUndo( pDoc, nTab, nTab ); //STRIP001 /*?*/ pDoc->CopyToDocument( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, //STRIP001 /*?*/ IDF_ALL, FALSE, pRedoDoc ); @@ -3883,7 +3883,7 @@ using namespace ::com::sun::star; /*N*/ // Undo fuer den leeren Link /*N*/ /*N*/ if (bUndo) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( new ScUndoInsertAreaLink( &rDocShell, +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 rDocShell.GetUndoManager()->AddUndoAction( new ScUndoInsertAreaLink( &rDocShell, //STRIP001 /*?*/ rFile, aFilterName, aNewOptions, //STRIP001 /*?*/ rSource, rDestRange, nRefresh ) ); /*N*/ diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx index 795d4f1cd..3dc12360c 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_docsh.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:06 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -542,7 +542,7 @@ static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCal /*N*/ } /*N*/ void ScDocShell::AfterXMLLoading(sal_Bool bRet) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (GetCreateMode() != SFX_CREATE_MODE_ORGANIZER) //STRIP001 { //STRIP001 UpdateLinks(); @@ -743,7 +743,7 @@ static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCal /*?*/ // modifying the document must be asynchronous /*?*/ // (handled by AddInitial) /*?*/ -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScAutoStyleHint& rStlHint = (ScAutoStyleHint&)rHint; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScAutoStyleHint& rStlHint = (ScAutoStyleHint&)rHint; //STRIP001 /*?*/ ScRange aRange = rStlHint.GetRange(); //STRIP001 /*?*/ String aName1 = rStlHint.GetStyle1(); //STRIP001 /*?*/ String aName2 = rStlHint.GetStyle2(); @@ -886,10 +886,10 @@ static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCal /*?*/ DBG_ERROR("Calc3/4: kein Storage"); /*N*/ } /*N*/ else if (aFltName.EqualsAscii(pFilterXML)) -/*?*/ { DBG_ASSERT(0, "STRIP"); }//STRIP001 bRet = LoadXML( &rMedium, NULL ); +/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 bRet = LoadXML( &rMedium, NULL ); /*N*/ else if (aFltName.EqualsAscii(pFilterSc10)) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SvStream* pStream = rMedium.GetInStream(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SvStream* pStream = rMedium.GetInStream(); //STRIP001 /*?*/ if (pStream) //STRIP001 /*?*/ { //STRIP001 /*?*/ FltError eError = ScImportStarCalc10( *pStream, &aDocument ); @@ -904,7 +904,7 @@ static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCal /*N*/ } /*N*/ else if (aFltName.EqualsAscii(pFilterLotus)) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream = rMedium.GetInStream(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream = rMedium.GetInStream(); //STRIP001 /*N*/ // if (pStream) //STRIP001 /*?*/ { //STRIP001 /*?*/ String sItStr; @@ -947,7 +947,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ aFltName.EqualsAscii(pFilterEx4Temp) || aFltName.EqualsAscii(pFilterEx5Temp) || /*N*/ aFltName.EqualsAscii(pFilterEx95Temp) || aFltName.EqualsAscii(pFilterEx97Temp) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EXCIMPFORMAT eFormat = EIF_AUTO; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EXCIMPFORMAT eFormat = EIF_AUTO; //STRIP001 /*?*/ if ( aFltName.EqualsAscii(pFilterExcel4) || aFltName.EqualsAscii(pFilterEx4Temp) ) //STRIP001 /*?*/ eFormat = EIF_BIFF_LE4; //STRIP001 /*?*/ else if ( aFltName.EqualsAscii(pFilterExcel5) || aFltName.EqualsAscii(pFilterExcel95) || @@ -1047,7 +1047,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ } /*N*/ else if (aFltName.EqualsAscii(pFilterDBase)) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 String sItStr; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 String sItStr; //STRIP001 /*?*/ SfxItemSet* pSet = rMedium.GetItemSet(); //STRIP001 /*?*/ const SfxPoolItem* pItem; //STRIP001 /*?*/ if ( pSet && SFX_ITEM_SET == @@ -1091,7 +1091,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*?*/ SvStream* pStream = rMedium.GetInStream(); /*?*/ if (pStream) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 FltError eError; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 FltError eError; //STRIP001 /*?*/ String sItStr; //STRIP001 /*?*/ SfxItemSet* pSet = rMedium.GetItemSet(); //STRIP001 /*?*/ const SfxPoolItem* pItem; @@ -1154,7 +1154,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ } /*N*/ else if (aFltName.EqualsAscii(pFilterRtf)) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 FltError eError = SCERR_IMPORT_UNKNOWN; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 FltError eError = SCERR_IMPORT_UNKNOWN; //STRIP001 /*?*/ if( !rMedium.IsStorage() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ SvStream* pInStream = rMedium.GetInStream(); @@ -1187,7 +1187,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ } /*N*/ else if (aFltName.EqualsAscii(pFilterHtml) || aFltName.EqualsAscii(pFilterHtmlWebQ)) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 FltError eError = SCERR_IMPORT_UNKNOWN; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 FltError eError = SCERR_IMPORT_UNKNOWN; //STRIP001 /*?*/ BOOL bWebQuery = aFltName.EqualsAscii(pFilterHtmlWebQ); //STRIP001 /*?*/ if( !rMedium.IsStorage() ) //STRIP001 /*?*/ { @@ -1272,7 +1272,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ // } /*N*/ } /*N*/ if ( bSetRowHeights ) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 UpdateAllRowHeights(); // with vdev or printer, depending on configuration +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 UpdateAllRowHeights(); // with vdev or printer, depending on configuration /*N*/ } /*N*/ FinishedLoading( SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES ); /*N*/ @@ -1313,7 +1313,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ if (pCharts) /*N*/ pCharts->UpdateDirtyCharts(); // Charts, die noch upgedated werden muessen /*N*/ if (pAutoStyleList) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren /*N*/ if (GetCreateMode()== SFX_CREATE_MODE_STANDARD) /*N*/ SvInPlaceObject::SetVisArea( Rectangle() ); // normal bearbeitet -> keine VisArea /*N*/ @@ -1349,7 +1349,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ if (pCharts) /*N*/ pCharts->UpdateDirtyCharts(); // Charts, die noch upgedated werden muessen /*N*/ if (pAutoStyleList) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pAutoStyleList->ExecuteAllNow(); // Vorlagen-Timeouts jetzt ausfuehren /*N*/ if (GetCreateMode()== SFX_CREATE_MODE_STANDARD) /*N*/ SvInPlaceObject::SetVisArea( Rectangle() ); // normal bearbeitet -> keine VisArea /*N*/ @@ -2187,7 +2187,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ bNoInformLost( TRUE ), /*N*/ __SCDOCSHELL_INIT /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::ScDocShell" ); //STRIP001 /*?*/ //STRIP001 /*?*/ SetPool( &SC_MOD()->GetPool() ); //STRIP001 /*?*/ @@ -2322,7 +2322,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ aDocument.InvalidateLastTableOpParams(); /*N*/ aDocument.Broadcast( SC_HINT_DATACHANGED, BCA_BRDCST_ALWAYS, NULL ); /*N*/ if ( aDocument.IsForcedFormulaPending() && aDocument.GetAutoCalc() ) -/*?*/ { DBG_ASSERT(0, "STRIP");} //STRIP001 aDocument.CalcFormulaTree( TRUE ); +/*?*/ { DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aDocument.CalcFormulaTree( TRUE ); /*N*/ PostDataChanged(); /*N*/ /*N*/ // Detective AutoUpdate: @@ -2414,7 +2414,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStrea /*N*/ { /*N*/ ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); /*N*/ if ( pViewSh ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL; }//STRIP001 return pViewSh->GetDialogParent(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL; }//STRIP001 return pViewSh->GetDialogParent(); /*N*/ else /*N*/ return Application::GetDefDialogParent(); /*N*/ } diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx index e2a7ac17b..6b06fde68 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_docsh2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:06 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -210,7 +210,7 @@ using namespace ::com::sun::star; /*?*/ const lang::Locale* pLocales = aLocales.getConstArray(); /*?*/ for (sal_Int32 i = 0; i < aLocales.getLength(); i++) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 i18n::ForbiddenCharacters aForbidden; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 i18n::ForbiddenCharacters aForbidden; //STRIP001 /*?*/ aAsian.GetStartEndChars( pLocales[i], aForbidden.beginLine, aForbidden.endLine ); //STRIP001 /*?*/ LanguageType eLang = SvxLocaleToLanguage(pLocales[i]); //STRIP001 /*?*/ //pDoc->SetForbiddenCharacters( eLang, aForbidden ); diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx index e86e1243d..831ab9fb1 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_docsh4.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -413,7 +413,7 @@ namespace binfilter { /*?*/ ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); /*?*/ if (pViewSh && bValid && aChartName.Len() != 0 ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Window* pParent = pViewSh->GetDialogParent(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Window* pParent = pViewSh->GetDialogParent(); //STRIP001 /*?*/ Window* pDataWin = pViewSh->GetActiveWin(); //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nCol1 = aSingleRange.aStart.Col(); @@ -515,7 +515,7 @@ namespace binfilter { /*?*/ rReq.Done(); /*?*/ break; /*?*/ case FID_HARD_RECALC: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DoHardRecalc( rReq.IsAPI() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DoHardRecalc( rReq.IsAPI() ); //STRIP001 /*?*/ rReq.Done(); /*?*/ break; /*N*/ case SID_UPDATETABLINKS: @@ -587,7 +587,7 @@ namespace binfilter { /*?*/ if ( pDBData->IsStripData() && /*?*/ pDBData->HasImportParam() && !pDBData->HasImportSelection() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDBData->GetArea(aRange); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDBData->GetArea(aRange); //STRIP001 /*?*/ pViewSh->MarkRange(aRange); //STRIP001 /*?*/ //STRIP001 /*?*/ // Import und interne Operationen wie SID_REFRESH_DBAREA @@ -644,7 +644,7 @@ namespace binfilter { /*?*/ /*?*/ case SID_GET_COLORTABLE: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // passende ColorTable ist per PutItem gesetzt worden +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // passende ColorTable ist per PutItem gesetzt worden //STRIP001 /*?*/ SvxColorTableItem* pColItem = (SvxColorTableItem*)GetItem(SID_COLOR_TABLE); //STRIP001 /*?*/ XColorTable* pTable = pColItem->GetColorTable(); //STRIP001 /*?*/ rReq.SetReturnValue(OfaPtrItem(SID_GET_COLORTABLE, pTable)); @@ -679,7 +679,7 @@ namespace binfilter { /*?*/ /*?*/ if ( bDo ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pChangeTrack->IsProtected() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pChangeTrack->IsProtected() ) //STRIP001 /*?*/ bDo = ExecuteChangeProtectionDialog(); //STRIP001 /*?*/ if ( bDo ) //STRIP001 /*?*/ { @@ -706,7 +706,7 @@ namespace binfilter { /*?*/ SfxChildWindow* pChild = pViewFrm->GetChildWindow(FID_CHG_ACCEPT); /*?*/ if (pChild) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((ScAcceptChgDlgWrapper*)pChild)->ReInitDlg(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((ScAcceptChgDlgWrapper*)pChild)->ReInitDlg(); /*?*/ } /*?*/ } /*?*/ @@ -725,7 +725,7 @@ namespace binfilter { /*?*/ /*?*/ case SID_CHG_PROTECT : /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( ExecuteChangeProtectionDialog() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( ExecuteChangeProtectionDialog() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ rReq.Done(); //STRIP001 /*?*/ SetDocumentModified(); @@ -742,7 +742,7 @@ namespace binfilter { /*?*/ ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack(); /*?*/ if ( pChangeTrack ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( nSlot == SID_DOCUMENT_COMPARE ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( nSlot == SID_DOCUMENT_COMPARE ) //STRIP001 /*?*/ { //! old changes trace will be lost //STRIP001 /*?*/ WarningBox aBox( GetDialogParent(), //STRIP001 /*?*/ WinBits(WB_YES_NO | WB_DEF_NO), @@ -805,7 +805,7 @@ namespace binfilter { /*?*/ pMed = new SfxMedium( aFileName, STREAM_STD_READ, FALSE, pFilter, pSet ); /*?*/ } /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pMed = pApp->InsertDocumentDialog( 0, ScDocShell::Factory() ); //STRIP001 /*?*/ if ( pMed ) //STRIP001 /*?*/ { @@ -844,7 +844,7 @@ namespace binfilter { /*?*/ /*?*/ if ( !pOtherDocSh->GetError() ) // nur Errors /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bHadTrack = ( aDocument.GetChangeTrack() != NULL ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bHadTrack = ( aDocument.GetChangeTrack() != NULL ); //STRIP001 /*?*/ //STRIP001 /*?*/ if ( nSlot == SID_DOCUMENT_COMPARE ) //STRIP001 /*?*/ CompareDocument( *pOtherDocSh->GetDocument() ); @@ -898,7 +898,7 @@ namespace binfilter { /*?*/ if ( pSh ) /*?*/ { /*?*/ //! SetTabNo in DeleteTable weglassen? -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nDispTab = pSh->GetViewData()->GetTabNo(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nDispTab = pSh->GetViewData()->GetTabNo(); //STRIP001 /*?*/ pSh->DeleteTable( nTab ); //STRIP001 /*?*/ pSh->SetTabNo(nDispTab); //STRIP001 /*?*/ rReq.Done(); @@ -922,7 +922,7 @@ namespace binfilter { /*?*/ { /*?*/ if (aDocument.IsScenario(nTab)) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 String aComment; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 String aComment; //STRIP001 /*?*/ Color aColor; //STRIP001 /*?*/ USHORT nFlags; //STRIP001 /*?*/ aDocument.GetScenarioData( nTab, aComment, aColor, nFlags ); @@ -965,7 +965,7 @@ namespace binfilter { /*?*/ { /*?*/ FmFormShell* pFSh = pSh->GetFormShell(); /*?*/ if ( pFSh ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pFSh->SetY2KState( nY2k ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pFSh->SetY2KState( nY2k ); /*?*/ } /*?*/ } /*?*/ } @@ -1067,7 +1067,7 @@ namespace binfilter { /*N*/ ScTabViewShell* pSh = GetBestViewShell(); /*N*/ if ( pSh ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScInputHandler* pHdl = SC_MOD()->GetInputHdl(pSh); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScInputHandler* pHdl = SC_MOD()->GetInputHdl(pSh); //STRIP001 /*?*/ if ( pHdl && pHdl->IsInputMode() && pHdl->IsFormulaMode() && !bApi ) //STRIP001 /*?*/ { //STRIP001 /*?*/ pHdl->FormulaPreview(); // Teilergebnis als QuickHelp @@ -1081,7 +1081,7 @@ namespace binfilter { /*N*/ } /*N*/ if (!bDone) // sonst Dokument neu berechnen /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 WaitObject aWaitObj( GetDialogParent() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 WaitObject aWaitObj( GetDialogParent() ); //STRIP001 /*?*/ aDocument.CalcFormulaTree(); //STRIP001 /*?*/ if ( pSh ) //STRIP001 /*?*/ pSh->UpdateCharts(TRUE); @@ -1152,7 +1152,7 @@ namespace binfilter { /*N*/ { /*N*/ if ( nId == SFX_STYLESHEET_MODIFIED ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( *this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( *this ); //STRIP001 /*?*/ //STRIP001 /*?*/ String aNewName = pStyle->GetName(); //STRIP001 /*?*/ String aOldName = aNewName; @@ -1328,7 +1328,7 @@ namespace binfilter { /*?*/ /*?*/ if (bWarn && !bApi) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScWaitCursorOff aWaitOff( GetDialogParent() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScWaitCursorOff aWaitOff( GetDialogParent() ); //STRIP001 /*?*/ InfoBox aInfoBox(GetDialogParent(), //STRIP001 /*?*/ ScGlobal::GetRscString(STR_PRINT_INVALID_AREA)); //STRIP001 /*?*/ aInfoBox.Execute(); @@ -1583,7 +1583,7 @@ namespace binfilter { /*?*/ /*?*/ if ( pStyleSheet ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxItemSet& rStyleSet = pStyleSheet->GetItemSet(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxItemSet& rStyleSet = pStyleSheet->GetItemSet(); //STRIP001 /*?*/ //STRIP001 /*?*/ GetPageOnFromPageStyleSet( &rStyleSet, nCurTab, bHeaderOn, bFooterOn ); //STRIP001 /*?*/ diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx index 6c0c370c7..a0cdbd230 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_docsh5.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -225,7 +225,7 @@ namespace binfilter { /*N*/ { /*N*/ //! StopMarking an der (aktiven) View? /*N*/ -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Window* pParent = GetDialogParent(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Window* pParent = GetDialogParent(); //STRIP001 /*?*/ ScWaitCursorOff aWaitOff( pParent ); //STRIP001 /*?*/ BOOL bFocus = pParent && pParent->HasFocus(); //STRIP001 /*?*/ @@ -252,7 +252,7 @@ namespace binfilter { /*N*/ void ScDocShell::DBAreaDeleted( USHORT nTab, USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2 ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( *this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( *this ); //STRIP001 /*?*/ aDocument.RemoveFlagsTab( nX1, nY1, nX2, nY1, nTab, SC_MF_AUTO ); //STRIP001 /*?*/ PostPaint( nX1, nY1, nTab, nX2, nY1, nTab, PAINT_GRID ); //STRIP001 /*?*/ aModificator.SetDocumentModified(); @@ -312,7 +312,7 @@ namespace binfilter { /*N*/ /*N*/ ScDBData* pData = aDocument.GetDBAtArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); /*N*/ if (!pData) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pData = lcl_GetDBNearCursor( aDocument.GetDBCollection(), nCol, nRow, nTab ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pData = lcl_GetDBNearCursor( aDocument.GetDBCollection(), nCol, nRow, nTab ); /*N*/ /*N*/ BOOL bSelected = ( bForceMark || rMarked.aStart != rMarked.aEnd ); /*N*/ @@ -449,7 +449,7 @@ namespace binfilter { /*N*/ /*N*/ if ( pUndoColl ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aDocument.CompileDBFormula( FALSE ); // CompileFormulaString +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aDocument.CompileDBFormula( FALSE ); // CompileFormulaString //STRIP001 /*?*/ //STRIP001 /*?*/ ScDBCollection* pRedoColl = new ScDBCollection( *pColl ); //STRIP001 /*?*/ GetUndoManager()->AddUndoAction( new ScUndoDBData( this, pUndoColl, pRedoColl ) ); @@ -620,7 +620,7 @@ namespace binfilter { /*N*/ /*N*/ if (rParam.bReferenceData) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nTabCount = aDocument.GetTableCount(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nTabCount = aDocument.GetTableCount(); //STRIP001 /*?*/ USHORT nInsertCount = aData.GetInsertCount(); //STRIP001 /*?*/ //STRIP001 /*?*/ // alte Outlines @@ -653,7 +653,7 @@ namespace binfilter { /*N*/ } /*N*/ else /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); //STRIP001 /*?*/ pUndoDoc->InitUndo( &aDocument, aDestArea.nTab, aDestArea.nTab ); //STRIP001 /*?*/ //STRIP001 /*?*/ aDocument.CopyToDocument( aDestArea.nColStart, aDestArea.nRowStart, aDestArea.nTab, @@ -728,7 +728,7 @@ namespace binfilter { /*N*/ } /*N*/ if (nSrcTab <= MAXTAB) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( aDocument.TestCopyScenario( nSrcTab, nTab ) ) // Zellschutz testen +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( aDocument.TestCopyScenario( nSrcTab, nTab ) ) // Zellschutz testen //STRIP001 /*?*/ { //STRIP001 /*?*/ ScDocShellModificator aModificator( *this ); //STRIP001 /*?*/ ScMarkData aScenMark; @@ -801,7 +801,7 @@ namespace binfilter { /*N*/ const Color& rColor, USHORT nFlags ) /*N*/ { /*?*/ // Undo -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 String aOldName; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 String aOldName; //STRIP001 /*?*/ aDocument.GetName( nTab, aOldName ); //STRIP001 /*?*/ String aOldComment; //STRIP001 /*?*/ Color aOldColor; @@ -831,7 +831,7 @@ namespace binfilter { /*N*/ const Color& rColor, USHORT nFlags, /*N*/ ScMarkData& rMark, BOOL bRecord ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 rMark.MarkToMulti(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 rMark.MarkToMulti(); //STRIP001 /*?*/ if (rMark.IsMultiMarked()) //STRIP001 /*?*/ { //STRIP001 /*?*/ USHORT nNewTab = nTab + 1; @@ -895,7 +895,7 @@ namespace binfilter { /*N*/ BOOL ScDocShell::MoveTable( USHORT nSrcTab, USHORT nDestTab, BOOL bCopy, BOOL bRecord ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( *this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( *this ); //STRIP001 /*?*/ //STRIP001 /*?*/ if (bCopy) //STRIP001 /*?*/ { @@ -969,7 +969,7 @@ namespace binfilter { /*N*/ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScDBData*, pDBData ) /*N*/ { - DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 ScDBDocFunc aFunc(*this); + DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 ScDBDocFunc aFunc(*this); //STRIP001 //STRIP001 BOOL bContinue = TRUE; //STRIP001 ScImportParam aImportParam; diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx index 92a2e0c59..04e5bfc97 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_docsh6.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -283,7 +283,7 @@ namespace binfilter { /*?*/ if (pViewSh) /*?*/ { /*?*/ if (pViewSh->GetViewData()->GetDocShell() == this) -/*?*/ { DBG_ASSERT(0, "STRIP"); }//STRIP001 pViewSh->UpdateOleZoom(); +/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pViewSh->UpdateOleZoom(); /*?*/ } /*?*/ //else /*?*/ // DataChanged( SvDataType() ); // fuer Zuppeln wenn nicht IP-aktiv @@ -291,7 +291,7 @@ namespace binfilter { /*N*/ /*N*/ if (aDocument.IsEmbedded()) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScTripel aOldStart,aOldEnd; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScTripel aOldStart,aOldEnd; //STRIP001 /*?*/ aDocument.GetEmbedded(aOldStart,aOldEnd); //STRIP001 /*?*/ aDocument.SetEmbedded( aArea ); //STRIP001 /*?*/ ScTripel aNewStart,aNewEnd; @@ -367,7 +367,7 @@ namespace binfilter { /*N*/ void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pStylePool->SetSearchMask(SFX_STYLE_FAMILY_PAGE, 0xffff); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pStylePool->SetSearchMask(SFX_STYLE_FAMILY_PAGE, 0xffff); //STRIP001 /*N*/ SfxStyleSheetBase *pStyle = pStylePool->First(); //STRIP001 /*N*/ while ( pStyle ) //STRIP001 /*N*/ { @@ -504,7 +504,7 @@ namespace binfilter { /*?*/ ::so3::SvBaseLink* pBase = *pLinkManager->GetLinks()[i]; /*?*/ if (pBase->ISA(ScTableLink)) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScTableLink* pTabLink = (ScTableLink*)pBase; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScTableLink* pTabLink = (ScTableLink*)pBase; //STRIP001 /*?*/ if (pTabLink->IsUsed()) //STRIP001 /*?*/ { //STRIP001 /*?*/ StrData* pData = new StrData(pTabLink->GetFileName()); diff --git a/binfilter/bf_sc/source/ui/docshell/sc_editable.cxx b/binfilter/bf_sc/source/ui/docshell/sc_editable.cxx index 6d030c478..f3bcdefbf 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_editable.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_editable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_editable.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,14 +105,14 @@ namespace binfilter { /*N*/ bIsEditable( TRUE ), /*N*/ bOnlyMatrix( TRUE ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 TestRange( pDoc, rRange ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 TestRange( pDoc, rRange ); /*N*/ } /*N*/ ScEditableTester::ScEditableTester( ScDocument* pDoc, const ScMarkData& rMark ) : /*N*/ bIsEditable( TRUE ), /*N*/ bOnlyMatrix( TRUE ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 TestSelection( pDoc, rMark ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 TestSelection( pDoc, rMark ); /*N*/ } //STRIP001 ScEditableTester::ScEditableTester( ScViewFunc* pView ) : diff --git a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx index bdb075a99..40fbc7cee 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_impex.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:09 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -486,29 +486,29 @@ namespace binfilter { /*N*/ } /*N*/ if( nFmt == SOT_FORMATSTR_ID_SYLK ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( Sylk2Doc( rStrm ) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( Sylk2Doc( rStrm ) ) /*?*/ return TRUE; /*N*/ } /*N*/ if( nFmt == SOT_FORMATSTR_ID_DIF ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( Dif2Doc( rStrm ) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( Dif2Doc( rStrm ) ) /*?*/ return TRUE; /*N*/ } /*N*/ if( nFmt == FORMAT_RTF ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( RTF2Doc( rStrm ) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( RTF2Doc( rStrm ) ) /*?*/ return TRUE; /*N*/ } /*N*/ if( nFmt == SOT_FORMATSTR_ID_LINK ) /*N*/ return TRUE; // Link-Import? /*N*/ if ( nFmt == SOT_FORMATSTR_ID_HTML ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( HTML2Doc( rStrm ) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( HTML2Doc( rStrm ) ) /*?*/ return TRUE; /*N*/ } /*N*/ if ( nFmt == SOT_FORMATSTR_ID_HTML_SIMPLE ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 MSE40HTMLClipFormatObj aMSE40ClpObj; // needed to skip the header data +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 MSE40HTMLClipFormatObj aMSE40ClpObj; // needed to skip the header data //STRIP001 /*?*/ SvStream* pHTML = aMSE40ClpObj.IsValid( rStrm ); //STRIP001 /*?*/ if ( pHTML && HTML2Doc( *pHTML ) ) /*?*/ return TRUE; @@ -1027,7 +1027,7 @@ enum DoubledQuoteMode /*N*/ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm ) /*N*/ { /*N*/ if (!pExtOptions) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 return Text2Doc( rStrm ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 return Text2Doc( rStrm ); /*N*/ /*N*/ ULONG nOldPos = rStrm.Tell(); /*N*/ rStrm.Seek( STREAM_SEEK_TO_END ); @@ -1095,7 +1095,7 @@ enum DoubledQuoteMode /*N*/ USHORT nCol = nStartCol; /*N*/ if ( bFixed ) // Feste Satzlaenge /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 for ( i=0; i<nInfoCount; i++ ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 for ( i=0; i<nInfoCount; i++ ) //STRIP001 /*?*/ { //STRIP001 /*?*/ if ( pColFormat[i] != SC_COL_SKIP ) // sonst auch nCol nicht hochzaehlen //STRIP001 /*?*/ { diff --git a/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx index 7e31d7734..fefc2d1cb 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_olinefun.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:09 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,7 +134,7 @@ namespace binfilter { /*N*/ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bSuccess = FALSE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bSuccess = FALSE; //STRIP001 /*?*/ USHORT nStartCol = rRange.aStart.Col(); //STRIP001 /*?*/ USHORT nStartRow = rRange.aStart.Row(); //STRIP001 /*?*/ USHORT nEndCol = rRange.aEnd.Col(); @@ -195,7 +195,7 @@ namespace binfilter { /*N*/ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bDone = FALSE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bDone = FALSE; //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nStartCol = rRange.aStart.Col(); //STRIP001 /*?*/ USHORT nStartRow = rRange.aStart.Row(); @@ -260,7 +260,7 @@ namespace binfilter { /*N*/ BOOL ScOutlineDocFunc::RemoveAllOutlines( USHORT nTab, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bSuccess = FALSE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bSuccess = FALSE; //STRIP001 /*?*/ ScDocument* pDoc = rDocShell.GetDocument(); //STRIP001 /*?*/ //STRIP001 /*?*/ if (bRecord && !pDoc->IsUndoEnabled()) @@ -313,7 +313,7 @@ namespace binfilter { /*N*/ BOOL ScOutlineDocFunc::AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nStartCol = rRange.aStart.Col(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nStartCol = rRange.aStart.Col(); //STRIP001 /*?*/ USHORT nStartRow = rRange.aStart.Row(); //STRIP001 /*?*/ USHORT nEndCol = rRange.aEnd.Col(); //STRIP001 /*?*/ USHORT nEndRow = rRange.aEnd.Row(); @@ -376,7 +376,7 @@ namespace binfilter { /*N*/ BOOL ScOutlineDocFunc::SelectLevel( USHORT nTab, BOOL bColumns, USHORT nLevel, /*N*/ BOOL bRecord, BOOL bPaint, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pDoc = rDocShell.GetDocument(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pDoc = rDocShell.GetDocument(); //STRIP001 /*?*/ //STRIP001 /*?*/ if (bRecord && !pDoc->IsUndoEnabled()) //STRIP001 /*?*/ bRecord = FALSE; @@ -449,7 +449,7 @@ namespace binfilter { //STRIP001 /*?*/ pDoc->UpdatePageBreaks( nTab ); //STRIP001 /*?*/ //STRIP001 /*?*/ if (bPaint) -//STRIP001 /*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 lcl_PaintWidthHeight( rDocShell, nTab, bColumns, nStart, nEnd ); +//STRIP001 /*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 lcl_PaintWidthHeight( rDocShell, nTab, bColumns, nStart, nEnd ); //STRIP001 /*?*/ //STRIP001 /*?*/ rDocShell.SetDocumentModified(); //STRIP001 /*?*/ lcl_InvalidateOutliner( rDocShell.GetViewBindings() ); @@ -461,7 +461,7 @@ namespace binfilter { /*N*/ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 BOOL bDone = FALSE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 BOOL bDone = FALSE; //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nStartCol = rRange.aStart.Col(); //STRIP001 /*?*/ USHORT nStartRow = rRange.aStart.Row(); @@ -560,7 +560,7 @@ namespace binfilter { /*N*/ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bDone = FALSE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bDone = FALSE; //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nStartCol = rRange.aStart.Col(); //STRIP001 /*?*/ USHORT nStartRow = rRange.aStart.Row(); @@ -737,7 +737,7 @@ namespace binfilter { /*N*/ BOOL ScOutlineDocFunc::HideOutline( USHORT nTab, BOOL bColumns, USHORT nLevel, USHORT nEntry, /*N*/ BOOL bRecord, BOOL bPaint, BOOL bApi ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 ScDocument* pDoc = rDocShell.GetDocument(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 ScDocument* pDoc = rDocShell.GetDocument(); //STRIP001 /*?*/ if (bRecord && !pDoc->IsUndoEnabled()) //STRIP001 /*?*/ bRecord = FALSE; //STRIP001 /*?*/ diff --git a/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx b/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx index c1d76667a..621f361d9 100644 --- a/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx +++ b/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_tablink.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:10 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -497,7 +497,7 @@ namespace binfilter { /*M*/ ScDocument* pDoc = pDocShell->GetDocument(); /*M*/ if( pDoc ) /*M*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ScExtDocOptions* pExtDocOpt = pDoc->GetExtDocOptions(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScExtDocOptions* pExtDocOpt = pDoc->GetExtDocOptions(); //STRIP001 /*?*/ if( !pExtDocOpt ) //STRIP001 /*?*/ { //STRIP001 /*?*/ pExtDocOpt = new ScExtDocOptions; diff --git a/binfilter/bf_sc/source/ui/inc/auditsh.hxx b/binfilter/bf_sc/source/ui/inc/auditsh.hxx index 53b4617db..987a71293 100644 --- a/binfilter/bf_sc/source/ui/inc/auditsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/auditsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: auditsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:34 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,8 +87,8 @@ public: ScAuditingShell(ScViewData* pData); //STRIP001 ~ScAuditingShell(); - void Execute(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 void Execute(SfxRequest& rReq); - void GetState(SfxItemSet& rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 void GetState(SfxItemSet& rSet); + void Execute(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void Execute(SfxRequest& rReq); + void GetState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void GetState(SfxItemSet& rSet); }; diff --git a/binfilter/bf_sc/source/ui/inc/autostyl.hxx b/binfilter/bf_sc/source/ui/inc/autostyl.hxx index 07f6f9260..0b3300e2d 100644 --- a/binfilter/bf_sc/source/ui/inc/autostyl.hxx +++ b/binfilter/bf_sc/source/ui/inc/autostyl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: autostyl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:34 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ class ScAutoStyleList //STRIP001 DECL_LINK( InitHdl, Timer* ); public: - ScAutoStyleList(ScDocShell* pShell){DBG_ASSERT(0, "STRIP");} //STRIP001 ScAutoStyleList(ScDocShell* pShell); + ScAutoStyleList(ScDocShell* pShell){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScAutoStyleList(ScDocShell* pShell); //STRIP001 ~ScAutoStyleList(); //STRIP001 //STRIP001 void AddInitial( const ScRange& rRange, const String& rStyle1, diff --git a/binfilter/bf_sc/source/ui/inc/cellsh.hxx b/binfilter/bf_sc/source/ui/inc/cellsh.hxx index c4ab5494c..e91a8f93e 100644 --- a/binfilter/bf_sc/source/ui/inc/cellsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/cellsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: cellsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:35 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,30 +106,30 @@ public: ScCellShell(ScViewData* pData); virtual ~ScCellShell(); - void Execute(SfxRequest &){DBG_ASSERT(0, "STRIP");} //STRIP001 void Execute(SfxRequest &); + void Execute(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void Execute(SfxRequest &); void GetState(SfxItemSet &); - void ExecuteEdit( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 void ExecuteEdit( SfxRequest& rReq ); - void ExecuteTrans( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 void ExecuteTrans( SfxRequest& rReq ); + void ExecuteEdit( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void ExecuteEdit( SfxRequest& rReq ); + void ExecuteTrans( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void ExecuteTrans( SfxRequest& rReq ); void GetBlockState( SfxItemSet& rSet ); void GetCellState( SfxItemSet& rSet ); - void ExecuteDB( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 void ExecuteDB( SfxRequest& rReq ); + void ExecuteDB( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void ExecuteDB( SfxRequest& rReq ); void GetDBState( SfxItemSet& rSet ); void ExecImageMap(SfxRequest& rReq); // ImageMap void GetImageMapState(SfxItemSet& rSet); void GetClipState( SfxItemSet& rSet ); - void GetHLinkState( SfxItemSet& rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 void GetHLinkState( SfxItemSet& rSet ); - - void ExecuteCursor( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 void ExecuteCursor( SfxRequest& rReq ); - void ExecuteCursorSel( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 void ExecuteCursorSel( SfxRequest& rReq ); - void ExecutePage( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 void ExecutePage( SfxRequest& rReq ); - void ExecutePageSel( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 void ExecutePageSel( SfxRequest& rReq ); - void ExecuteMove( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 void ExecuteMove( SfxRequest& rReq ); - void GetStateCursor( SfxItemSet& rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 void GetStateCursor( SfxItemSet& rSet ); + void GetHLinkState( SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void GetHLinkState( SfxItemSet& rSet ); + + void ExecuteCursor( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void ExecuteCursor( SfxRequest& rReq ); + void ExecuteCursorSel( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void ExecuteCursorSel( SfxRequest& rReq ); + void ExecutePage( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void ExecutePage( SfxRequest& rReq ); + void ExecutePageSel( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void ExecutePageSel( SfxRequest& rReq ); + void ExecuteMove( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void ExecuteMove( SfxRequest& rReq ); + void GetStateCursor( SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void GetStateCursor( SfxItemSet& rSet ); }; diff --git a/binfilter/bf_sc/source/ui/inc/chartsh.hxx b/binfilter/bf_sc/source/ui/inc/chartsh.hxx index f0f45f6fb..15c66d27e 100644 --- a/binfilter/bf_sc/source/ui/inc/chartsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/chartsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chartsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:36 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,7 @@ public: //STRIP001 TYPEINFO(); SFX_DECL_INTERFACE(SCID_CHART_SHELL); - ScChartShell(ScViewData* pData):ScDrawShell(pData){DBG_ASSERT(0, "STRIP");}//STRIP001 ScChartShell(ScViewData* pData); + ScChartShell(ScViewData* pData):ScDrawShell(pData){DBG_BF_ASSERT(0, "STRIP");}//STRIP001 ScChartShell(ScViewData* pData); //STRIP001 virtual ~ScChartShell(); }; diff --git a/binfilter/bf_sc/source/ui/inc/colrowba.hxx b/binfilter/bf_sc/source/ui/inc/colrowba.hxx index 9645993c6..6216e6553 100644 --- a/binfilter/bf_sc/source/ui/inc/colrowba.hxx +++ b/binfilter/bf_sc/source/ui/inc/colrowba.hxx @@ -2,9 +2,9 @@ * * $RCSfile: colrowba.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:36 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,19 +91,19 @@ public: virtual USHORT GetPos(); virtual USHORT GetEntrySize( USHORT nEntryNo ); - virtual String GetEntryText( USHORT nEntryNo ){DBG_ASSERT(0, "STRIP");String aStr; return aStr;} //STRIP001 virtual String GetEntryText( USHORT nEntryNo ); + virtual String GetEntryText( USHORT nEntryNo ){DBG_BF_ASSERT(0, "STRIP");String aStr; return aStr;} //STRIP001 virtual String GetEntryText( USHORT nEntryNo ); - virtual void SetEntrySize( USHORT nPos, USHORT nNewSize ){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void SetEntrySize( USHORT nPos, USHORT nNewSize ); - virtual void HideEntries( USHORT nStart, USHORT nEnd ){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void HideEntries( USHORT nStart, USHORT nEnd ); + virtual void SetEntrySize( USHORT nPos, USHORT nNewSize ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void SetEntrySize( USHORT nPos, USHORT nNewSize ); + virtual void HideEntries( USHORT nStart, USHORT nEnd ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void HideEntries( USHORT nStart, USHORT nEnd ); virtual void SetMarking( BOOL bSet ); - virtual void SelectWindow(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void SelectWindow(); - virtual BOOL IsDisabled(){DBG_ASSERT(0, "STRIP");return FALSE;} //STRIP001 virtual BOOL IsDisabled(); - virtual BOOL ResizeAllowed(){DBG_ASSERT(0, "STRIP");return FALSE;} //STRIP001 virtual BOOL ResizeAllowed(); + virtual void SelectWindow(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void SelectWindow(); + virtual BOOL IsDisabled(){DBG_BF_ASSERT(0, "STRIP");return FALSE;} //STRIP001 virtual BOOL IsDisabled(); + virtual BOOL ResizeAllowed(){DBG_BF_ASSERT(0, "STRIP");return FALSE;} //STRIP001 virtual BOOL ResizeAllowed(); - virtual void DrawInvert( long nDragPos ){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void DrawInvert( long nDragPos ); + virtual void DrawInvert( long nDragPos ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void DrawInvert( long nDragPos ); - virtual String GetDragHelp( long nVal ){DBG_ASSERT(0, "STRIP"); String aStr; return aStr;}//STRIP001 virtual String GetDragHelp( long nVal ); + virtual String GetDragHelp( long nVal ){DBG_BF_ASSERT(0, "STRIP"); String aStr; return aStr;}//STRIP001 virtual String GetDragHelp( long nVal ); }; @@ -121,21 +121,21 @@ public: virtual USHORT GetPos(); virtual USHORT GetEntrySize( USHORT nEntryNo ); - virtual String GetEntryText( USHORT nEntryNo ){DBG_ASSERT(0, "STRIP"); String s; return s;}//STRIP001 virtual String GetEntryText( USHORT nEntryNo ); + virtual String GetEntryText( USHORT nEntryNo ){DBG_BF_ASSERT(0, "STRIP"); String s; return s;}//STRIP001 virtual String GetEntryText( USHORT nEntryNo ); - virtual USHORT GetHiddenCount( USHORT nEntryNo ){DBG_ASSERT(0, "STRIP"); return 0;}//STRIP001 virtual USHORT GetHiddenCount( USHORT nEntryNo ); // nur fuer Zeilen + virtual USHORT GetHiddenCount( USHORT nEntryNo ){DBG_BF_ASSERT(0, "STRIP"); return 0;}//STRIP001 virtual USHORT GetHiddenCount( USHORT nEntryNo ); // nur fuer Zeilen - virtual void SetEntrySize( USHORT nPos, USHORT nNewSize ){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void SetEntrySize( USHORT nPos, USHORT nNewSize ); - virtual void HideEntries( USHORT nStart, USHORT nEnd ){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void HideEntries( USHORT nStart, USHORT nEnd ); + virtual void SetEntrySize( USHORT nPos, USHORT nNewSize ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void SetEntrySize( USHORT nPos, USHORT nNewSize ); + virtual void HideEntries( USHORT nStart, USHORT nEnd ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void HideEntries( USHORT nStart, USHORT nEnd ); virtual void SetMarking( BOOL bSet ); - virtual void SelectWindow(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void SelectWindow(); - virtual BOOL IsDisabled(){DBG_ASSERT(0, "STRIP"); return FALSE;}//STRIP001 virtual BOOL IsDisabled(); - virtual BOOL ResizeAllowed(){DBG_ASSERT(0, "STRIP"); return FALSE;}//STRIP001 virtual BOOL ResizeAllowed(); + virtual void SelectWindow(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void SelectWindow(); + virtual BOOL IsDisabled(){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}//STRIP001 virtual BOOL IsDisabled(); + virtual BOOL ResizeAllowed(){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}//STRIP001 virtual BOOL ResizeAllowed(); - virtual void DrawInvert( long nDragPos ){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void DrawInvert( long nDragPos ); + virtual void DrawInvert( long nDragPos ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void DrawInvert( long nDragPos ); - virtual String GetDragHelp( long nVal ){DBG_ASSERT(0, "STRIP"); String s; return s;}//STRIP001 virtual String GetDragHelp( long nVal ); + virtual String GetDragHelp( long nVal ){DBG_BF_ASSERT(0, "STRIP"); String s; return s;}//STRIP001 virtual String GetDragHelp( long nVal ); }; diff --git a/binfilter/bf_sc/source/ui/inc/docsh.hxx b/binfilter/bf_sc/source/ui/inc/docsh.hxx index ffbdefe89..c9cfdd05a 100644 --- a/binfilter/bf_sc/source/ui/inc/docsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/docsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -266,11 +266,11 @@ public: //STRIP001 void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); - void GetSbxState( SfxItemSet &rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 void GetSbxState( SfxItemSet &rSet ); - void GetDrawObjState( SfxItemSet &rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 void GetDrawObjState( SfxItemSet &rSet ); + void GetSbxState( SfxItemSet &rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void GetSbxState( SfxItemSet &rSet ); + void GetDrawObjState( SfxItemSet &rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void GetDrawObjState( SfxItemSet &rSet ); void Execute( SfxRequest& rReq ); - void GetState( SfxItemSet &rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 void GetState( SfxItemSet &rSet ); + void GetState( SfxItemSet &rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void GetState( SfxItemSet &rSet ); //STRIP001 void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, USHORT nCurTab ); void GetStatePageStyle( SfxViewShell& rCaller, SfxItemSet& rSet, USHORT nCurTab ); diff --git a/binfilter/bf_sc/source/ui/inc/drawsh.hxx b/binfilter/bf_sc/source/ui/inc/drawsh.hxx index d22d50e25..e531e897e 100644 --- a/binfilter/bf_sc/source/ui/inc/drawsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/drawsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drawsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,24 +96,24 @@ public: TYPEINFO(); SFX_DECL_INTERFACE(SCID_DRAW_SHELL); - ScDrawShell(ScViewData* pData){DBG_ASSERT(0, "STRIP");} //STRIP001 ScDrawShell(ScViewData* pData); + ScDrawShell(ScViewData* pData){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScDrawShell(ScViewData* pData); //STRIP001 ~ScDrawShell(); - void StateDisableItems( SfxItemSet &rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void StateDisableItems( SfxItemSet &rSet ); + void StateDisableItems( SfxItemSet &rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void StateDisableItems( SfxItemSet &rSet ); - void ExecDrawAttr(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecDrawAttr(SfxRequest& rReq); - void GetDrawAttrState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetDrawAttrState(SfxItemSet &rSet); - void GetAttrFuncState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAttrFuncState(SfxItemSet &rSet); + void ExecDrawAttr(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecDrawAttr(SfxRequest& rReq); + void GetDrawAttrState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetDrawAttrState(SfxItemSet &rSet); + void GetAttrFuncState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAttrFuncState(SfxItemSet &rSet); - void ExecDrawFunc(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecDrawFunc(SfxRequest& rReq); - void GetDrawFuncState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetDrawFuncState(SfxItemSet &rSet); - void GetState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetState(SfxItemSet &rSet); + void ExecDrawFunc(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecDrawFunc(SfxRequest& rReq); + void GetDrawFuncState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetDrawFuncState(SfxItemSet &rSet); + void GetState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetState(SfxItemSet &rSet); - void ExecFormText(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecFormText(SfxRequest& rReq); // StarFontWork - void GetFormTextState(SfxItemSet& rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetFormTextState(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecFormText(SfxRequest& rReq); // StarFontWork + void GetFormTextState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetFormTextState(SfxItemSet& rSet); - void ExecuteHLink(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteHLink(SfxRequest& rReq); // Hyperlink - void GetHLinkState(SfxItemSet& rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetHLinkState(SfxItemSet& rSet); + void ExecuteHLink(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteHLink(SfxRequest& rReq); // Hyperlink + void GetHLinkState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetHLinkState(SfxItemSet& rSet); //STRIP001 void ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); //STRIP001 void ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage = 0xffff ); diff --git a/binfilter/bf_sc/source/ui/inc/drformsh.hxx b/binfilter/bf_sc/source/ui/inc/drformsh.hxx index 30d233500..b445c23e3 100644 --- a/binfilter/bf_sc/source/ui/inc/drformsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/drformsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drformsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ public: //STRIP001 TYPEINFO(); SFX_DECL_INTERFACE(SCID_FORM_SHELL); - ScDrawFormShell(ScViewData* pData):ScDrawShell(pData){DBG_ASSERT(0, "STRIP");} //STRIP001 ScDrawFormShell(ScViewData* pData); + ScDrawFormShell(ScViewData* pData):ScDrawShell(pData){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScDrawFormShell(ScViewData* pData); //STRIP001 virtual ~ScDrawFormShell(); // void Execute(SfxRequest &); diff --git a/binfilter/bf_sc/source/ui/inc/drtxtob.hxx b/binfilter/bf_sc/source/ui/inc/drtxtob.hxx index 49ac2d3c2..1cdbd0bd8 100644 --- a/binfilter/bf_sc/source/ui/inc/drtxtob.hxx +++ b/binfilter/bf_sc/source/ui/inc/drtxtob.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drtxtob.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,26 +96,26 @@ public: //STRIP001 TYPEINFO(); SFX_DECL_INTERFACE(SCID_DRAW_TEXT_SHELL); - ScDrawTextObjectBar(ScViewData* pData){DBG_ASSERT(0, "STRIP"); } + ScDrawTextObjectBar(ScViewData* pData){DBG_BF_ASSERT(0, "STRIP"); } //STRIP001 ~ScDrawTextObjectBar(); - void StateDisableItems( SfxItemSet &rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void StateDisableItems( SfxItemSet &rSet ); + void StateDisableItems( SfxItemSet &rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void StateDisableItems( SfxItemSet &rSet ); - void Execute( SfxRequest &rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void Execute( SfxRequest &rReq ); - void ExecuteTrans( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteTrans( SfxRequest& rReq ); - void GetState( SfxItemSet& rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetState( SfxItemSet& rSet ); - void GetClipState( SfxItemSet& rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetClipState( SfxItemSet& rSet ); + void Execute( SfxRequest &rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void Execute( SfxRequest &rReq ); + void ExecuteTrans( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteTrans( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetState( SfxItemSet& rSet ); + void GetClipState( SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetClipState( SfxItemSet& rSet ); - void ExecuteAttr( SfxRequest &rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 //STRIP001 void ExecuteAttr( SfxRequest &rReq ); - void GetAttrState( SfxItemSet& rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAttrState( SfxItemSet& rSet ); - void ExecuteToggle( SfxRequest &rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteToggle( SfxRequest &rReq ); + void ExecuteAttr( SfxRequest &rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 //STRIP001 void ExecuteAttr( SfxRequest &rReq ); + void GetAttrState( SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAttrState( SfxItemSet& rSet ); + void ExecuteToggle( SfxRequest &rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteToggle( SfxRequest &rReq ); //STRIP001 //STRIP001 BOOL ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet ); //STRIP001 BOOL ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet ); //STRIP001 - void ExecuteExtra( SfxRequest &rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteExtra( SfxRequest &rReq ); - void ExecFormText(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecFormText(SfxRequest& rReq); // StarFontWork - void GetFormTextState(SfxItemSet& rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetFormTextState(SfxItemSet& rSet); + void ExecuteExtra( SfxRequest &rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteExtra( SfxRequest &rReq ); + void ExecFormText(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecFormText(SfxRequest& rReq); // StarFontWork + void GetFormTextState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetFormTextState(SfxItemSet& rSet); //STRIP001 //STRIP001 private: //STRIP001 void ExecuteGlobal( SfxRequest &rReq ); // von Execute gerufen fuer ganze Objekte diff --git a/binfilter/bf_sc/source/ui/inc/drwtrans.hxx b/binfilter/bf_sc/source/ui/inc/drwtrans.hxx index 03c7f3780..882f4c8c0 100644 --- a/binfilter/bf_sc/source/ui/inc/drwtrans.hxx +++ b/binfilter/bf_sc/source/ui/inc/drwtrans.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drwtrans.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,9 +110,9 @@ private: //STRIP001 SvInPlaceObjectRef GetSingleObject(); public: - ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell, const TransferableObjectDescriptor& rDesc ){DBG_ASSERT(0, "STRIP");}; //STRIP001 ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell, + ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell, const TransferableObjectDescriptor& rDesc ){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell, //STRIP001 const TransferableObjectDescriptor& rDesc ); - virtual ~ScDrawTransferObj(){DBG_ASSERT(0, "STRIP");}; //STRIP001 virtual ~ScDrawTransferObj(); + virtual ~ScDrawTransferObj(){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 virtual ~ScDrawTransferObj(); //STRIP001 virtual void AddSupportedFormats(); //STRIP001 virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); diff --git a/binfilter/bf_sc/source/ui/inc/editsh.hxx b/binfilter/bf_sc/source/ui/inc/editsh.hxx index 22644ffe8..e00c97e59 100644 --- a/binfilter/bf_sc/source/ui/inc/editsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/editsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: editsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:43 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,21 +100,21 @@ public: //STRIP001 TYPEINFO(); SFX_DECL_INTERFACE(SCID_EDIT_SHELL); - ScEditShell(EditView* pView, ScViewData* pData){DBG_ASSERT(0, "STRIP");} //STRIP001 ScEditShell(EditView* pView, ScViewData* pData); + ScEditShell(EditView* pView, ScViewData* pData){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScEditShell(EditView* pView, ScViewData* pData); //STRIP001 ~ScEditShell(); //STRIP001 //STRIP001 void SetEditView(EditView* pView); //STRIP001 - void Execute(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void Execute(SfxRequest& rReq); - void ExecuteTrans(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteTrans(SfxRequest& rReq); - void GetState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetState(SfxItemSet &rSet); - void GetClipState(SfxItemSet& rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetClipState(SfxItemSet& rSet); + void Execute(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void Execute(SfxRequest& rReq); + void ExecuteTrans(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteTrans(SfxRequest& rReq); + void GetState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetState(SfxItemSet &rSet); + void GetClipState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetClipState(SfxItemSet& rSet); //STRIP001 - void ExecuteAttr(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteAttr(SfxRequest& rReq); - void GetAttrState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAttrState(SfxItemSet &rSet); + void ExecuteAttr(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteAttr(SfxRequest& rReq); + void GetAttrState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAttrState(SfxItemSet &rSet); //STRIP001 - void ExecuteUndo(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteUndo(SfxRequest& rReq); - void GetUndoState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetUndoState(SfxItemSet &rSet); + void ExecuteUndo(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteUndo(SfxRequest& rReq); + void GetUndoState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetUndoState(SfxItemSet &rSet); //STRIP001 //STRIP001 String GetSelectionText( BOOL bWholeWord ); }; diff --git a/binfilter/bf_sc/source/ui/inc/formatsh.hxx b/binfilter/bf_sc/source/ui/inc/formatsh.hxx index 3ea3a142a..47921792e 100644 --- a/binfilter/bf_sc/source/ui/inc/formatsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/formatsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: formatsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:44 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,27 +93,27 @@ public: ScFormatShell(ScViewData* pData); virtual ~ScFormatShell(); - void ExecuteNumFormat( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteNumFormat( SfxRequest& rReq ); - void GetNumFormatState( SfxItemSet& rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetNumFormatState( SfxItemSet& rSet ); + void ExecuteNumFormat( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteNumFormat( SfxRequest& rReq ); + void GetNumFormatState( SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetNumFormatState( SfxItemSet& rSet ); - void ExecuteAttr( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteAttr( SfxRequest& rReq ); + void ExecuteAttr( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteAttr( SfxRequest& rReq ); void GetAttrState( SfxItemSet& rSet ); - void ExecuteAlignment( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteAlignment( SfxRequest& rReq ); + void ExecuteAlignment( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteAlignment( SfxRequest& rReq ); - void ExecuteTextAttr( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteTextAttr( SfxRequest& rReq ); + void ExecuteTextAttr( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteTextAttr( SfxRequest& rReq ); void GetTextAttrState( SfxItemSet& rSet ); - void GetAlignState( SfxItemSet& rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAlignState( SfxItemSet& rSet ); - void GetBorderState( SfxItemSet& rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetBorderState( SfxItemSet& rSet ); + void GetAlignState( SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAlignState( SfxItemSet& rSet ); + void GetBorderState( SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetBorderState( SfxItemSet& rSet ); - void ExecuteStyle( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteStyle( SfxRequest& rReq ); + void ExecuteStyle( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteStyle( SfxRequest& rReq ); void GetStyleState( SfxItemSet& rSet ); //STRIP001 void ExecBckCol( SfxRequest& rReq ); //STRIP001 void GetBckColState( SfxItemSet& rSet ); - void ExecuteTextDirection( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteTextDirection( SfxRequest& rReq ); + void ExecuteTextDirection( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteTextDirection( SfxRequest& rReq ); void GetTextDirectionState( SfxItemSet& rSet ); }; diff --git a/binfilter/bf_sc/source/ui/inc/formdata.hxx b/binfilter/bf_sc/source/ui/inc/formdata.hxx index 95c9bb243..26a6020ce 100644 --- a/binfilter/bf_sc/source/ui/inc/formdata.hxx +++ b/binfilter/bf_sc/source/ui/inc/formdata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: formdata.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:44 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,8 +79,8 @@ namespace binfilter { class ScFormEditData { public: - ScFormEditData(){DBG_ASSERT(0, "STRIP");} //STRIP001 ScFormEditData(); - ~ScFormEditData(){DBG_ASSERT(0, "STRIP");} //STRIP001 ~ScFormEditData(); + ScFormEditData(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScFormEditData(); + ~ScFormEditData(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ~ScFormEditData(); //STRIP001 //STRIP001 void SaveValues(); //STRIP001 void RestoreValues(); diff --git a/binfilter/bf_sc/source/ui/inc/fupoor.hxx b/binfilter/bf_sc/source/ui/inc/fupoor.hxx index 805ee4d2f..70b3f68ea 100644 --- a/binfilter/bf_sc/source/ui/inc/fupoor.hxx +++ b/binfilter/bf_sc/source/ui/inc/fupoor.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fupoor.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:49 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -154,7 +154,7 @@ private: //STRIP001 //STRIP001 void SetWindow(Window* pWin) { pWindow = pWin; } //STRIP001 - USHORT GetSlotID() const { DBG_ASSERT(0, "STRIP"); return 0;} //STRIP001 USHORT GetSlotID() const { return( aSfxRequest.GetSlot() );} + USHORT GetSlotID() const { DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 USHORT GetSlotID() const { return( aSfxRequest.GetSlot() );} //STRIP001 //STRIP001 BOOL IsDetectiveHit( const Point& rLogicPos ); //STRIP001 diff --git a/binfilter/bf_sc/source/ui/inc/graphsh.hxx b/binfilter/bf_sc/source/ui/inc/graphsh.hxx index de102e773..1898fcd7b 100644 --- a/binfilter/bf_sc/source/ui/inc/graphsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/graphsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: graphsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:50 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,14 +86,14 @@ public: //STRIP001 TYPEINFO(); SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL); - ScGraphicShell(ScViewData* pData):ScDrawShell(pData){DBG_ASSERT(0, "STRIP");} //STRIP001 ScGraphicShell(ScViewData* pData); + ScGraphicShell(ScViewData* pData):ScDrawShell(pData){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScGraphicShell(ScViewData* pData); //STRIP001 virtual ~ScGraphicShell(); //STRIP001 - void Execute(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void Execute(SfxRequest& rReq); - void GetAttrState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAttrState(SfxItemSet &rSet); + void Execute(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void Execute(SfxRequest& rReq); + void GetAttrState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetAttrState(SfxItemSet &rSet); - void ExecuteFilter(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteFilter(SfxRequest& rReq); - void GetFilterState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetFilterState(SfxItemSet &rSet); + void ExecuteFilter(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void ExecuteFilter(SfxRequest& rReq); + void GetFilterState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 //STRIP001 void GetFilterState(SfxItemSet &rSet); }; } //namespace binfilter diff --git a/binfilter/bf_sc/source/ui/inc/hintwin.hxx b/binfilter/bf_sc/source/ui/inc/hintwin.hxx index b76287d4e..fe8e21859 100644 --- a/binfilter/bf_sc/source/ui/inc/hintwin.hxx +++ b/binfilter/bf_sc/source/ui/inc/hintwin.hxx @@ -2,9 +2,9 @@ * * $RCSfile: hintwin.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:52 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ class ScHintWindow : public Window //STRIP001 virtual void Paint( const Rectangle& rRect ); //STRIP001 public: - ScHintWindow( Window* pParent, const String& rTit, const String& rMsg ):Window( pParent ){DBG_ASSERT(0, "STRIP");} //STRIP001 ;//STRIP001 ScHintWindow( Window* pParent, const String& rTit, const String& rMsg ); + ScHintWindow( Window* pParent, const String& rTit, const String& rMsg ):Window( pParent ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ;//STRIP001 ScHintWindow( Window* pParent, const String& rTit, const String& rMsg ); //STRIP001 ~ScHintWindow(); }; diff --git a/binfilter/bf_sc/source/ui/inc/hiranges.hxx b/binfilter/bf_sc/source/ui/inc/hiranges.hxx index aef33d32f..d60fba2e0 100644 --- a/binfilter/bf_sc/source/ui/inc/hiranges.hxx +++ b/binfilter/bf_sc/source/ui/inc/hiranges.hxx @@ -2,9 +2,9 @@ * * $RCSfile: hiranges.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ class ScHighlightRanges //STRIP001 List aEntries; public: - ScHighlightRanges(){DBG_ASSERT(0, "STRIP");} //STRIP001 ScHighlightRanges(); + ScHighlightRanges(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScHighlightRanges(); //STRIP001 ~ScHighlightRanges(); //STRIP001 //STRIP001 ULONG Count() const { return aEntries.Count(); } diff --git a/binfilter/bf_sc/source/ui/inc/inputhdl.hxx b/binfilter/bf_sc/source/ui/inc/inputhdl.hxx index 556126180..68e707087 100644 --- a/binfilter/bf_sc/source/ui/inc/inputhdl.hxx +++ b/binfilter/bf_sc/source/ui/inc/inputhdl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: inputhdl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:53 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -221,7 +221,7 @@ public: //STRIP001 void InputSelection( EditView* pView ); //STRIP001 void InputChanged( EditView* pView ); - void ViewShellGone(ScTabViewShell* pViewSh){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ViewShellGone(ScTabViewShell* pViewSh); + void ViewShellGone(ScTabViewShell* pViewSh){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ViewShellGone(ScTabViewShell* pViewSh); void SetRefViewShell(ScTabViewShell* pRefVsh) {pRefViewSh=pRefVsh;} diff --git a/binfilter/bf_sc/source/ui/inc/navipi.hxx b/binfilter/bf_sc/source/ui/inc/navipi.hxx index bb8adaaf6..1c5359841 100644 --- a/binfilter/bf_sc/source/ui/inc/navipi.hxx +++ b/binfilter/bf_sc/source/ui/inc/navipi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: navipi.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -391,7 +391,7 @@ public: ScNavigatorDialogWrapper( Window* pParent, USHORT nId, SfxBindings* pBindings, - SfxChildWinInfo* pInfo ):SfxChildWindowContext( nId ){DBG_ASSERT(0, "STRIP");} //STRIP001 SfxChildWinInfo* pInfo ); + SfxChildWinInfo* pInfo ):SfxChildWindowContext( nId ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW_CONTEXT(ScNavigatorDialogWrapper) diff --git a/binfilter/bf_sc/source/ui/inc/notemark.hxx b/binfilter/bf_sc/source/ui/inc/notemark.hxx index 1125186a7..19c6301bf 100644 --- a/binfilter/bf_sc/source/ui/inc/notemark.hxx +++ b/binfilter/bf_sc/source/ui/inc/notemark.hxx @@ -2,9 +2,9 @@ * * $RCSfile: notemark.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,7 +104,7 @@ public: Window* pRight, Window* pBottom, Window* pDiagonal,//STRIP001 Window* pRight, Window* pBottom, Window* pDiagonal, ScDocument* pD, ScAddress aPos, //STRIP001 ScDocument* pD, ScAddress aPos, const String& rUser, const MapMode& rMap, //STRIP001 const String& rUser, const MapMode& rMap, - BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard ){DBG_ASSERT(0, "STRIP");} //STRIP001 BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard ); + BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard ); //STRIP001 ~ScNoteMarker(); //STRIP001 //STRIP001 void Draw(); diff --git a/binfilter/bf_sc/source/ui/inc/oleobjsh.hxx b/binfilter/bf_sc/source/ui/inc/oleobjsh.hxx index 56f4ab904..ea370d263 100644 --- a/binfilter/bf_sc/source/ui/inc/oleobjsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/oleobjsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: oleobjsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:58 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,7 @@ public: //STRIP001 TYPEINFO(); SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL); - ScOleObjectShell(ScViewData* pData):ScDrawShell(pData){DBG_ASSERT(0, "STRIP"); } + ScOleObjectShell(ScViewData* pData):ScDrawShell(pData){DBG_BF_ASSERT(0, "STRIP"); } //STRIP001 virtual ~ScOleObjectShell(); }; diff --git a/binfilter/bf_sc/source/ui/inc/output.hxx b/binfilter/bf_sc/source/ui/inc/output.hxx index bbb9ae381..892a21443 100644 --- a/binfilter/bf_sc/source/ui/inc/output.hxx +++ b/binfilter/bf_sc/source/ui/inc/output.hxx @@ -2,9 +2,9 @@ * * $RCSfile: output.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -192,7 +192,7 @@ private: //STRIP001 double GetStretch(); - void DrawRotatedFrame( const Color* pForceColor ){DBG_ASSERT(0, "STRIP");} //STRIP001 void DrawRotatedFrame( const Color* pForceColor ); // pixel + void DrawRotatedFrame( const Color* pForceColor ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void DrawRotatedFrame( const Color* pForceColor ); // pixel public: ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, diff --git a/binfilter/bf_sc/source/ui/inc/pagedata.hxx b/binfilter/bf_sc/source/ui/inc/pagedata.hxx index be0e3ff7d..6049b97dd 100644 --- a/binfilter/bf_sc/source/ui/inc/pagedata.hxx +++ b/binfilter/bf_sc/source/ui/inc/pagedata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pagedata.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:29:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,7 +114,7 @@ class ScPageBreakData //STRIP001 ScPrintRangeData* pData; // Array public: - ScPageBreakData(USHORT nMax){DBG_ASSERT(0, "STRIP");} //STRIP001 ScPageBreakData(USHORT nMax); + ScPageBreakData(USHORT nMax){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScPageBreakData(USHORT nMax); //STRIP001 ~ScPageBreakData(); //STRIP001 //STRIP001 USHORT GetCount() const { return nUsed; } diff --git a/binfilter/bf_sc/source/ui/inc/pgbrksh.hxx b/binfilter/bf_sc/source/ui/inc/pgbrksh.hxx index 852b4fc03..b12226674 100644 --- a/binfilter/bf_sc/source/ui/inc/pgbrksh.hxx +++ b/binfilter/bf_sc/source/ui/inc/pgbrksh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pgbrksh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:30:00 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,7 +80,7 @@ public: //STRIP001 TYPEINFO(); SFX_DECL_INTERFACE(SCID_PAGEBREAK_SHELL); - ScPageBreakShell( ScTabViewShell* pView ):SfxShell(NULL){DBG_ASSERT(0, "STRIP");} //STRIP001 ScPageBreakShell( ScTabViewShell* pView ); + ScPageBreakShell( ScTabViewShell* pView ):SfxShell(NULL){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScPageBreakShell( ScTabViewShell* pView ); //STRIP001 ~ScPageBreakShell(); }; diff --git a/binfilter/bf_sc/source/ui/inc/pivotsh.hxx b/binfilter/bf_sc/source/ui/inc/pivotsh.hxx index 7dcdbc6a6..9238aca5f 100644 --- a/binfilter/bf_sc/source/ui/inc/pivotsh.hxx +++ b/binfilter/bf_sc/source/ui/inc/pivotsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pivotsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:30:01 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,8 +84,8 @@ public: ScPivotShell( ScTabViewShell* pView ):SfxShell(NULL){DBG_ASSERT(0, "STRIP")}; //STRIP001 ScPivotShell( ScTabViewShell* pView ); //STRIP001 ~ScPivotShell(); //STRIP001 - void Execute ( SfxRequest& rReq ){DBG_ASSERT(0, "STRIP");} //STRIP001 void Execute ( SfxRequest& rReq ); - void GetState( SfxItemSet& rSet ){DBG_ASSERT(0, "STRIP");} //STRIP001 void GetState( SfxItemSet& rSet ); + void Execute ( SfxRequest& rReq ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void Execute ( SfxRequest& rReq ); + void GetState( SfxItemSet& rSet ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void GetState( SfxItemSet& rSet ); //STRIP001 //STRIP001 private: //STRIP001 ScTabViewShell* pViewShell; diff --git a/binfilter/bf_sc/source/ui/inc/printfun.hxx b/binfilter/bf_sc/source/ui/inc/printfun.hxx index 94927db2f..1e92061ad 100644 --- a/binfilter/bf_sc/source/ui/inc/printfun.hxx +++ b/binfilter/bf_sc/source/ui/inc/printfun.hxx @@ -2,9 +2,9 @@ * * $RCSfile: printfun.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:30:03 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -328,7 +328,7 @@ public: void ResetBreaks( USHORT nTab ); //STRIP001 void GetPrintState( ScPrintState& rState ); - BOOL GetLastSourceRange( ScRange& rRange ) const{DBG_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 BOOL GetLastSourceRange( ScRange& rRange ) const; + BOOL GetLastSourceRange( ScRange& rRange ) const{DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 BOOL GetLastSourceRange( ScRange& rRange ) const; #ifdef _PRINTFUN_CXX private: diff --git a/binfilter/bf_sc/source/ui/inc/refundo.hxx b/binfilter/bf_sc/source/ui/inc/refundo.hxx index ba413fa25..f62502874 100644 --- a/binfilter/bf_sc/source/ui/inc/refundo.hxx +++ b/binfilter/bf_sc/source/ui/inc/refundo.hxx @@ -2,9 +2,9 @@ * * $RCSfile: refundo.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:30:05 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ private: //STRIP001 ScAreaLinkSaveCollection* pAreaLinks; public: - ScRefUndoData( const ScDocument* pDoc ){DBG_ASSERT(0, "STRIP");} //STRIP001 ScRefUndoData( const ScDocument* pDoc ); + ScRefUndoData( const ScDocument* pDoc ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ScRefUndoData( const ScDocument* pDoc ); //STRIP001 ~ScRefUndoData(); //STRIP001 void DeleteUnchanged( const ScDocument* pDoc ); diff --git a/binfilter/bf_sc/source/ui/inc/select.hxx b/binfilter/bf_sc/source/ui/inc/select.hxx index fdf344218..ae1f0d7f5 100644 --- a/binfilter/bf_sc/source/ui/inc/select.hxx +++ b/binfilter/bf_sc/source/ui/inc/select.hxx @@ -2,9 +2,9 @@ * * $RCSfile: select.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:30:06 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,13 +108,13 @@ public: //STRIP001 void SetAnchor( USHORT nPosX, USHORT nPosY ); //STRIP001 void SetAnchorFlag( BOOL bSet ); - virtual void BeginDrag(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void BeginDrag(); - virtual void CreateAnchor(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void CreateAnchor(); - virtual void DestroyAnchor(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void DestroyAnchor(); - virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ){DBG_ASSERT(0, "STRIP");return FALSE;} //STRIP001 virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); - virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ){DBG_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); + virtual void BeginDrag(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void BeginDrag(); + virtual void CreateAnchor(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void CreateAnchor(); + virtual void DestroyAnchor(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void DestroyAnchor(); + virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ){DBG_BF_ASSERT(0, "STRIP");return FALSE;} //STRIP001 virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); + virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); virtual void DeselectAtPoint( const Point& rPointPixel ){DBG_ASSERT(0, "STRIP")}; //STRIP001 virtual void DeselectAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void DeselectAll(); + virtual void DeselectAll(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void DeselectAll(); //STRIP001 BOOL SetCursorAtCell( short nPosX, short nPosY, BOOL bScroll ); }; @@ -139,13 +139,13 @@ public: //STRIP001 void SetColumn( BOOL bSet ); //STRIP001 void SetWhich( ScSplitPos eNew ); - virtual void BeginDrag(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void BeginDrag(); - virtual void CreateAnchor(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void CreateAnchor(); - virtual void DestroyAnchor(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void DestroyAnchor(); - virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ){DBG_ASSERT(0, "STRIP");return FALSE;} //STRIP001 virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); - virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ){DBG_ASSERT(0, "STRIP");return FALSE;}//STRIP001 virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAtPoint( const Point& rPointPixel ){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void DeselectAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void DeselectAll(); + virtual void BeginDrag(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void BeginDrag(); + virtual void CreateAnchor(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void CreateAnchor(); + virtual void DestroyAnchor(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void DestroyAnchor(); + virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ){DBG_BF_ASSERT(0, "STRIP");return FALSE;} //STRIP001 virtual BOOL SetCursorAtPoint( const Point& rPointPixel, BOOL bDontSelectAtCursor = FALSE ); + virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ){DBG_BF_ASSERT(0, "STRIP");return FALSE;}//STRIP001 virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ); + virtual void DeselectAtPoint( const Point& rPointPixel ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void DeselectAtPoint( const Point& rPointPixel ); + virtual void DeselectAll(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void DeselectAll(); void SetAnchorFlag(BOOL bSet) { bAnchor = bSet; } }; diff --git a/binfilter/bf_sc/source/ui/inc/tabview.hxx b/binfilter/bf_sc/source/ui/inc/tabview.hxx index baef2a1b5..a82fea7c2 100644 --- a/binfilter/bf_sc/source/ui/inc/tabview.hxx +++ b/binfilter/bf_sc/source/ui/inc/tabview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tabview.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:30:10 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -361,7 +361,7 @@ public: SvxZoomType GetZoomType() const { return eZoomType; } void SetZoomType( SvxZoomType eNew ) { eZoomType = eNew; } - USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom ){DBG_ASSERT(0, "STRIP"); return 0; } //STRIP001 USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom ); + USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom ){DBG_BF_ASSERT(0, "STRIP"); return 0; } //STRIP001 USHORT CalcZoom( SvxZoomType eType, USHORT nOldZoom ); // void CalcZoom( SvxZoomType eType, USHORT& rZoom, USHORT& rCol, USHORT& rRow ); diff --git a/binfilter/bf_sc/source/ui/inc/uiitems.hxx b/binfilter/bf_sc/source/ui/inc/uiitems.hxx index 2bc1e2b79..e5e21cf10 100644 --- a/binfilter/bf_sc/source/ui/inc/uiitems.hxx +++ b/binfilter/bf_sc/source/ui/inc/uiitems.hxx @@ -2,9 +2,9 @@ * * $RCSfile: uiitems.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:30:16 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -199,8 +199,8 @@ public: ~ScSortItem(); //STRIP001 virtual String GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const{DBG_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_ASSERT(0, "STRIP");return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP");return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; ScViewData* GetViewData () const { return pViewData; } //STRIP001 const ScSortParam& GetSortData () const { return theSortData; } @@ -226,8 +226,8 @@ public: ~ScQueryItem(); //STRIP001 virtual String GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const{DBG_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; ScViewData* GetViewData () const { return pViewData; } //STRIP001 const ScQueryParam& GetQueryData() const { return theQueryData; } @@ -258,8 +258,8 @@ public: ~ScSubTotalItem(); //STRIP001 virtual String GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const{DBG_ASSERT(0, "STRIP"); return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; ScViewData* GetViewData () const { return pViewData; } const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } @@ -281,8 +281,8 @@ public: ~ScUserListItem(); //STRIP001 virtual String GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const{DBG_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; //STRIP001 void SetUserList ( const ScUserList& rUserList ); //STRIP001 ScUserList* GetUserList () const { return pUserList; } @@ -304,8 +304,8 @@ public: ~ScConsolidateItem(); //STRIP001 virtual String GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const{DBG_ASSERT(0, "STRIP"); return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; //STRIP001 const ScConsolidateParam& GetData() const { return theConsData; } @@ -326,8 +326,8 @@ public: ~ScPivotItem(); //STRIP001 virtual String GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const{DBG_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_ASSERT(0, "STRIP");return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP");return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; //STRIP001 const ScDPSaveData& GetData() const { return *pSaveData; } //STRIP001 const ScRange& GetDestRange() const { return aDestRange; } @@ -352,8 +352,8 @@ public: ~ScSolveItem(); //STRIP001 virtual String GetValueText() const; - virtual int operator==( const SfxPoolItem& ) const{DBG_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; //STRIP001 const ScSolveParam& GetData() const { return theSolveData; } diff --git a/binfilter/bf_sc/source/ui/inc/viewdata.hxx b/binfilter/bf_sc/source/ui/inc/viewdata.hxx index e47922e29..ad01e2055 100644 --- a/binfilter/bf_sc/source/ui/inc/viewdata.hxx +++ b/binfilter/bf_sc/source/ui/inc/viewdata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: viewdata.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:30:19 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -323,7 +323,7 @@ public: BOOL GetSimpleArea( USHORT& rStartCol, USHORT& rStartRow, USHORT& rStartTab, USHORT& rEndCol, USHORT& rEndRow, USHORT& rEndTab ); BOOL GetSimpleArea( ScRange& rRange ); - void GetMultiArea( ScRangeListRef& rRange ){DBG_ASSERT(0, "STRIP");} //STRIP001 void GetMultiArea( ScRangeListRef& rRange ); + void GetMultiArea( ScRangeListRef& rRange ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void GetMultiArea( ScRangeListRef& rRange ); //STRIP001 BOOL SimpleColMarked(); //STRIP001 BOOL SimpleRowMarked(); diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx index b823fe41a..814dd7b5f 100644 --- a/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx +++ b/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_filtuno.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:31:34 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -193,7 +193,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) if ( xInputStream.is() ) pInStream = ::utl::UcbStreamHelper::CreateStream( xInputStream ); - DBG_ASSERT(0, "STRIP"); //STRIP001 ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( NULL, aPrivDatName, pInStream, cAsciiDel ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( NULL, aPrivDatName, pInStream, cAsciiDel ); //STRIP001 if ( pDlg->Execute() == RET_OK ) //STRIP001 { //STRIP001 ScAsciiOptions aOptions; @@ -272,7 +272,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) } ScImportOptions aOptions( cAsciiDel, cStrDel, eEncoding); - DBG_ASSERT(0, "STRIP"); //STRIP001 ScImportOptionsDlg* pDlg = new ScImportOptionsDlg( NULL, bAscii, + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScImportOptionsDlg* pDlg = new ScImportOptionsDlg( NULL, bAscii, //STRIP001 &aOptions, &aTitle, bMultiByte, bDBEnc, //STRIP001 !bExport ); //STRIP001 diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_targuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_targuno.cxx index 554997630..3aecaf3a0 100644 --- a/binfilter/bf_sc/source/ui/unoobj/sc_targuno.cxx +++ b/binfilter/bf_sc/source/ui/unoobj/sc_targuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_targuno.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:31:37 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -293,7 +293,7 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType } if (nImgId) { - DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bHighContrast = Application::GetSettings().GetStyleSettings().GetWindowColor().IsDark(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bHighContrast = Application::GetSettings().GetStyleSettings().GetWindowColor().IsDark(); //STRIP001 ImageList aEntryImages( ScResId( bHighContrast ? RID_IMAGELIST_H_NAVCONT : RID_IMAGELIST_NAVCONT ) ); //STRIP001 const Image& rImage = aEntryImages.GetImage( nImgId ); //STRIP001 BitmapEx aBitmapEx( rImage.GetBitmap() ); diff --git a/binfilter/bf_sc/source/ui/view/sc_printfun.cxx b/binfilter/bf_sc/source/ui/view/sc_printfun.cxx index da3371797..b03541330 100644 --- a/binfilter/bf_sc/source/ui/view/sc_printfun.cxx +++ b/binfilter/bf_sc/source/ui/view/sc_printfun.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_printfun.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:31:55 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -710,9 +710,9 @@ namespace binfilter { /*N*/ if ( bChangeCol && bChangeRow ) /*?*/ bFound = pDoc->GetPrintArea( nPrintTab, nEndCol, nEndRow, bNotes ); /*N*/ else if ( bChangeCol ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 bFound = pDoc->GetPrintAreaHor( nPrintTab, nStartRow, nEndRow, nEndCol, bNotes ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 bFound = pDoc->GetPrintAreaHor( nPrintTab, nStartRow, nEndRow, nEndCol, bNotes ); /*N*/ else if ( bChangeRow ) -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 bFound = pDoc->GetPrintAreaVer( nPrintTab, nStartCol, nEndCol, nEndRow, bNotes ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 bFound = pDoc->GetPrintAreaVer( nPrintTab, nStartCol, nEndCol, nEndRow, bNotes ); /*N*/ /*N*/ if (!bFound) /*N*/ return FALSE; // leer @@ -2430,11 +2430,11 @@ BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? /*?*/ CalcZoom(i); /*?*/ if ( aTableParam.bSkipEmpty ) /*?*/ for (nY=0; nY<nPagesY; nY++) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nPages += pPageRows[nY].CountVisible(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nPages += pPageRows[nY].CountVisible(); /*?*/ else /*?*/ nPages += ((long) nPagesX) * nPagesY; /*?*/ if ( pPageData ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ FillPageData(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ FillPageData(); /*?*/ } /*N*/ } /*N*/ else @@ -2442,11 +2442,11 @@ BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? /*N*/ CalcZoom(RANGENO_NORANGE); // Zoom berechnen /*N*/ if ( aTableParam.bSkipEmpty ) /*?*/ for (nY=0; nY<nPagesY; nY++) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nPages += pPageRows[nY].CountVisible(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nPages += pPageRows[nY].CountVisible(); /*N*/ else /*N*/ nPages += ((long) nPagesX) * nPagesY; /*N*/ if ( pPageData ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ FillPageData(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ FillPageData(); /*N*/ } /*N*/ return nPages; /*N*/ } @@ -2514,7 +2514,7 @@ BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? /*?*/ long nNoteNr = 0; /*?*/ long nNoteAdd; /*?*/ do -/*?*/ {DBG_ASSERT(0, "STRIP"); nNoteAdd=0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); nNoteAdd=0;//STRIP001 //STRIP001 /*?*/ nNoteAdd = PrintNotes( nPages, nNoteNr, FALSE, NULL ); //STRIP001 /*?*/ if (nNoteAdd) //STRIP001 /*?*/ { @@ -2590,7 +2590,7 @@ BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? /*N*/ long nStartPage, long nDisplayStart, BOOL bDoPrint, /*N*/ SfxProgress* pProgress, ScPreviewLocationData* pLocationData ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 DBG_ASSERT(pDev,"Device == NULL"); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 DBG_ASSERT(pDev,"Device == NULL"); //STRIP001 if (!pParamSet) //STRIP001 return 0; //STRIP001 @@ -2926,7 +2926,7 @@ BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? /*N*/ pPageRows[nPagesY].SetEndRow( i-1 ); /*N*/ pPageRows[nPagesY].SetPagesX( nPagesX ); /*N*/ if (aTableParam.bSkipEmpty) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX ); /*N*/ ++nPagesY; /*N*/ } /*N*/ @@ -2948,7 +2948,7 @@ BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? /*N*/ pPageRows[nPagesY].SetEndRow( nEndRow ); /*N*/ pPageRows[nPagesY].SetPagesX( nPagesX ); /*N*/ if (aTableParam.bSkipEmpty) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ lcl_SetHidden( pDoc, nPrintTab, pPageRows[nPagesY], nStartCol, pPageEndX ); /*N*/ ++nPagesY; /*N*/ } /*N*/ } @@ -2960,7 +2960,7 @@ BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? /*N*/ ScJobSetup::ScJobSetup( SfxPrinter* pPrinter ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 eOrientation = pPrinter->GetOrientation(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 eOrientation = pPrinter->GetOrientation(); //STRIP001 /*?*/ nPaperBin = pPrinter->GetPaperBin(); //STRIP001 /*?*/ ePaper = pPrinter->GetPaper(); //STRIP001 /*?*/ diff --git a/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx b/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx index 978b302f5..86f588159 100644 --- a/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx +++ b/binfilter/bf_sc/source/ui/view/sc_viewdata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sc_viewdata.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hjs $ $Date: 2004-04-15 10:58:43 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1200,7 +1200,7 @@ USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! /*N*/ } /*N*/ /*N*/ if (pEngine) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pEngine->SetStatusEventHdl( LINK( this, ScViewData, EmptyEditHdl ) ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pEngine->SetStatusEventHdl( LINK( this, ScViewData, EmptyEditHdl ) ); /*N*/ } /*N*/ void ScViewData::KillEditView() @@ -1583,7 +1583,7 @@ USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! /*N*/ { /*?*/ //! public Methode um Position anzupassen /*?*/ -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bHOver = FALSE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bHOver = FALSE; //STRIP001 /*?*/ while (pDoc->IsHorOverlapped( rPosX, rPosY, nTabNo )) //STRIP001 /*?*/ { --rPosX; bHOver=TRUE; } //STRIP001 /*?*/ BOOL bVOver = FALSE; @@ -1895,7 +1895,7 @@ USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! /*N*/ /*N*/ if ( pDoc && pDoc->HasDetectiveObjects(nTabNo) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nEndCol = 0; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nEndCol = 0; //STRIP001 /*?*/ USHORT nDummy = 0; //STRIP001 /*?*/ pDoc->GetTableArea( nTabNo, nEndCol, nDummy ); //STRIP001 /*?*/ if (nEndCol<20) diff --git a/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx b/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx index 854126575..abacca480 100644 --- a/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx +++ b/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_SchAddInCollection.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:19 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -153,7 +153,7 @@ using namespace ::com::sun::star; /*N*/ uno::Reference< util::XRefreshable > SchAddInCollection::GetAddInByName( const ::rtl::OUString& rName ) /*N*/ { /*N*/ if( ! mbInitialized ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 Initialize(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 Initialize(); /*N*/ /*N*/ const sal_Int32 nSize = maServiceNames.getLength(); /*N*/ for( sal_Int32 i = 0; i < nSize; i++ ) diff --git a/binfilter/bf_sch/source/core/sch_axisid.cxx b/binfilter/bf_sch/source/core/sch_axisid.cxx index 9ccc3208b..95e1785df 100644 --- a/binfilter/bf_sch/source/core/sch_axisid.cxx +++ b/binfilter/bf_sch/source/core/sch_axisid.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_axisid.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:20 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -164,7 +164,7 @@ namespace binfilter { /*N*/ SdrObjUserData* SchAxisId::Clone(SdrObject *pObj) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchAxisId (*this); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchAxisId (*this); /*N*/ } /************************************************************************* diff --git a/binfilter/bf_sch/source/core/sch_chartdoc.cxx b/binfilter/bf_sch/source/core/sch_chartdoc.cxx index 29b0fea34..2c63e439a 100644 --- a/binfilter/bf_sch/source/core/sch_chartdoc.cxx +++ b/binfilter/bf_sch/source/core/sch_chartdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chartdoc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,7 +168,7 @@ namespace binfilter { |* \************************************************************************/ /*N*/ SdrModel* ChartModel::AllocModel() const -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL; //STRIP001 //STRIP001 #ifdef DBG_UTIL //STRIP001 ByteString aBStr( aMainTitle, RTL_TEXTENCODING_ASCII_US ); //STRIP001 CHART_TRACE1( "ChartModel::AllocModel (%s)", aBStr.GetBuffer() ); diff --git a/binfilter/bf_sch/source/core/sch_chaxis.cxx b/binfilter/bf_sch/source/core/sch_chaxis.cxx index 2df96ae6d..3b9fd42cc 100644 --- a/binfilter/bf_sch/source/core/sch_chaxis.cxx +++ b/binfilter/bf_sch/source/core/sch_chaxis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chaxis.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -931,7 +931,7 @@ namespace binfilter { /*N*/ while(nLines) //nLines ist 0 wenn kein CHSTYLE_2D_LINE_STACKEDCOLUMN /*N*/ { /*?*/ if( IsDataOnAxis( nIndex )) -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 UpdateRowMinMax( nIndex, nColCnt, mbPercent, fMin, fMax ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 UpdateRowMinMax( nIndex, nColCnt, mbPercent, fMin, fMax ); /*?*/ nLines--; /*?*/ nIndex++; /*N*/ } @@ -1206,7 +1206,7 @@ namespace binfilter { /*N*/ mpAxisAttr->Get(SCHATTR_TEXT_ORIENT)).GetValue(); /*N*/ // Determine the size of the texts bounding box. /*N*/ if (meTextOrient == CHTXTORIENT_STACKED) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pOutliner->SetText (StackString(aString), pOutliner->GetParagraph (0)); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pOutliner->SetText (StackString(aString), pOutliner->GetParagraph (0)); /*N*/ else /*N*/ pOutliner->SetText(aString, pOutliner->GetParagraph (0)); /*N*/ pOutliner->SetUpdateMode (TRUE); @@ -2791,14 +2791,14 @@ namespace binfilter { /*N*/ nMrgFmt = mpNumFormatter->GetMergeFmtIndex( nFmt ); /*N*/ if( nFmt != nMrgFmt ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SetNumFormat( mbPercent, nMrgFmt ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetNumFormat( mbPercent, nMrgFmt ); //STRIP001 /*?*/ bRet = TRUE; /*N*/ } /*N*/ /*N*/ nFmt = GetNumFormat( ! mbPercent ); /*N*/ nMrgFmt = mpNumFormatter->GetMergeFmtIndex( nFmt ); /*N*/ if( nFmt != nMrgFmt ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 SetNumFormat( ! mbPercent, nMrgFmt ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SetNumFormat( ! mbPercent, nMrgFmt ); /*N*/ /*N*/ return bRet; /*N*/ } diff --git a/binfilter/bf_sch/source/core/sch_chdescr.cxx b/binfilter/bf_sch/source/core/sch_chdescr.cxx index 45dedb898..a2947fa4f 100644 --- a/binfilter/bf_sch/source/core/sch_chdescr.cxx +++ b/binfilter/bf_sch/source/core/sch_chdescr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chdescr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -177,7 +177,7 @@ namespace binfilter { /*N*/ /*N*/ if(mbEnable && eDescr != CHDESCR_NONE) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Create(nRow); //evtl. Array und Liste erstellen +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Create(nRow); //evtl. Array und Liste erstellen //STRIP001 /*?*/ long nIndex = nCol + nRow * mnCols; //STRIP001 /*?*/ //STRIP001 /*?*/ mpDescrArray[nIndex].eDescr = eDescr; diff --git a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx index dcf53a18d..3fba9ae67 100644 --- a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chtmod2a.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -222,7 +222,7 @@ namespace binfilter { /*N*/ /*N*/ if( (eDescr != CHDESCR_NONE) && bShowDataDescr ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ // data description required +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ // data description required //STRIP001 /*?*/ if (!pDescription) //STRIP001 /*?*/ { //STRIP001 /*?*/ pDescription = new DataDescription[ nColCnt ]; @@ -506,7 +506,7 @@ namespace binfilter { /*N*/ Get(SCHATTR_DATADESCR_DESCR)).GetValue(); /*N*/ /*N*/ if( (eDescr != CHDESCR_NONE) && bShowDataDescr) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /************************************************************** * DataDescription erforderlich **************************************************************/ @@ -775,7 +775,7 @@ namespace binfilter { /*N*/ BOOL bRepaint = FALSE; /*N*/ if( IsXYChart() && ! ISFLAGSET( nChartStatus, CHS_USER_NOQUERY ) ) // in this case ask for sorting -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ double fTemp = GetData( 0, 0, FALSE ); //STRIP001 /*?*/ //STRIP001 /*?*/ // is data unsorted? @@ -888,7 +888,7 @@ namespace binfilter { /*N*/ if( ((const SfxBoolItem &) rDataRowAttr.Get( SCHATTR_STAT_AVERAGE )).GetValue() ) // pStatLists[ nRow ]->NbcInsertObject( AverageValueY( nRow, FALSE, aRect, - {DBG_ASSERT(0, "STRIP"); }//STRIP001 pList->NbcInsertObject( AverageValueY( nRow, FALSE, aRect, + {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pList->NbcInsertObject( AverageValueY( nRow, FALSE, aRect, //STRIP001 pAxis->CalcFact( GetAverageValueY( nRow )))); /*N*/ aSplinePoints.clear(); @@ -946,7 +946,7 @@ namespace binfilter { /*N*/ /*N*/ if ((SvxChartKindError) /*?*/ ((const SfxInt32Item &) aDataPointAttr.Get (SCHATTR_STAT_KIND_ERROR)).GetValue () != CHERROR_NONE) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 AverageErrorY(nRow,fDataY,aPoint,FALSE,aDataPointAttr,pStatLists[nRow],pAxis); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 AverageErrorY(nRow,fDataY,aPoint,FALSE,aDataPointAttr,pStatLists[nRow],pAxis); /*N*/ /*N*/ if(aDescr.Enabled()) /*N*/ { @@ -974,7 +974,7 @@ namespace binfilter { /*N*/ if( bIsSplineChart ) /*N*/ { /*?*/ if ((eChartStyle == CHSTYLE_2D_CUBIC_SPLINE_XY) || (eChartStyle == CHSTYLE_2D_CUBIC_SPLINE_SYMBOL_XY)) -/*?*/ {DBG_ASSERT(0, "STRIP"); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ long nDPIX = 0; //STRIP001 /*?*/ long nDPIY = 0; //STRIP001 /*?*/ OutputDevice * pRefDev = GetRefDevice(); @@ -1042,7 +1042,7 @@ namespace binfilter { // ------------------------------------ /*N*/ if (((const SfxInt32Item &) rDataRowAttr.Get (SCHATTR_STAT_REGRESSTYPE)).GetValue () != CHREGRESS_NONE) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 double fConst; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 double fConst; //STRIP001 /*?*/ double fReg; //STRIP001 /*?*/ double fCorr; //STRIP001 /*?*/ @@ -1463,7 +1463,7 @@ namespace binfilter { /*?*/ if (!pDescription) /*?*/ { /*?*/ // DataDescription noch nicht vorhanden -> erzeugen -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDescription = new DataDescription [nRowCnt * nColCnt]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDescription = new DataDescription [nRowCnt * nColCnt]; //STRIP001 /*?*/ ClearDataDescription(pDescription,(nRowCnt * nColCnt)); /*?*/ } /*?*/ @@ -1538,7 +1538,7 @@ namespace binfilter { /*N*/ /*N*/ if (pDescription) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDescription [nIndex].fValue = GetData(nCol,nRow,FALSE);//#55586# fData; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDescription [nIndex].fValue = GetData(nCol,nRow,FALSE);//#55586# fData; //STRIP001 /*?*/ pDescription [nIndex].aTextPos2D.X () = aDataLine [nPoints - 1].X (); //STRIP001 /*?*/ pDescription [nIndex].aTextPos2D.Y () = aDataLine [nPoints - 1].Y (); //STRIP001 /*?*/ pDescription [nIndex].eAdjust = eAdjust; @@ -1678,7 +1678,7 @@ namespace binfilter { /*?*/ (pDescription [nIndex].eDescr == CHDESCR_TEXTANDPERCENT)) /*?*/ if (fTotal > 100.0000001) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ERROR2( "Dirty2D: ROW value is being changed total=%lf, Vman=%lf", +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DBG_ERROR2( "Dirty2D: ROW value is being changed total=%lf, Vman=%lf", //STRIP001 /*?*/ fTotal, pDescription[nDirty].fValue ); //STRIP001 /*?*/ pDescription [nDirty].fValue -= fTotal - 100.0; //STRIP001 /*?*/ bIsDirty = TRUE; @@ -1737,7 +1737,7 @@ namespace binfilter { /*?*/ (pDescription [nIndex].eDescr == CHDESCR_TEXTANDPERCENT)) /*?*/ if (fTotal > 100.0000001) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ERROR2( "Dirty2D: COL value is being changed total=%lf, Vman=%lf", +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DBG_ERROR2( "Dirty2D: COL value is being changed total=%lf, Vman=%lf", //STRIP001 /*?*/ fTotal, pDescription[nDirty].fValue ); //STRIP001 /*?*/ pDescription [nDirty].fValue -= fTotal - 100.0; //STRIP001 /*?*/ bIsDirty = TRUE; diff --git a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx index b9f6e4866..c92d63f65 100644 --- a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chtmod3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1225,7 +1225,7 @@ namespace binfilter { /*N*/ /*N*/ if( pScene && bShowDataDescrLocal ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ CreateDataDescr( aDescription, nCol, nRow, NULL, FALSE, TRUE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ CreateDataDescr( aDescription, nCol, nRow, NULL, FALSE, TRUE ); //STRIP001 /*?*/ aDescription.pLabelObj->SetMarkProtect( TRUE ); //STRIP001 /*?*/ E3dLabelObj* pLabel = new E3dLabelObj( aDescription.aTextPos3D, //STRIP001 /*?*/ aDescription.pLabelObj ); @@ -1414,7 +1414,7 @@ namespace binfilter { /*?*/ if (!pDescription) /*?*/ { /*?*/ // DataDescription noch nicht vorhanden -> erzeugen -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDescription = new DataDescription [nColCnt]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDescription = new DataDescription [nColCnt]; /*?*/ //STRIP001 ClearDataDescription(pDescription,nColCnt); /*?*/ } /*?*/ @@ -1473,7 +1473,7 @@ namespace binfilter { /*?*/ /*?*/ if( eDescr != CHDESCR_NONE && bValidData ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 CreateDataDescr( pDescription[ nCol ], nCol, nRow, NULL, FALSE, TRUE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 CreateDataDescr( pDescription[ nCol ], nCol, nRow, NULL, FALSE, TRUE ); //STRIP001 /*?*/ pDescription[ nCol ].pLabelObj->SetMarkProtect( TRUE ); //STRIP001 /*?*/ E3dLabelObj* pLabel=new E3dLabelObj( pDescription[nCol].aTextPos3D, //STRIP001 /*?*/ pDescription[nCol].pLabelObj ); @@ -1605,7 +1605,7 @@ namespace binfilter { /*?*/ if (!pDescription) /*?*/ { /*?*/ // DataDescription noch nicht vorhanden -> erzeugen -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDescription = new DataDescription [nRowCnt]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDescription = new DataDescription [nRowCnt]; //STRIP001 /*?*/ ClearDataDescription(pDescription,nRowCnt); /*?*/ } /*?*/ @@ -1863,7 +1863,7 @@ namespace binfilter { /*?*/ { /*?*/ if (pScene && pDescription[nRow].fValue != DBL_MIN) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 CreateDataDescr(pDescription[nRow], nCol, nRow, NULL, TRUE, TRUE); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 CreateDataDescr(pDescription[nRow], nCol, nRow, NULL, TRUE, TRUE); //STRIP001 /*?*/ pDescription[nRow].pLabelObj->SetMarkProtect(TRUE); //STRIP001 /*?*/ E3dLabelObj* pLabel=new E3dLabelObj( pDescription[nRow].aTextPos3D, //STRIP001 /*?*/ pDescription[nRow].pLabelObj ); @@ -2175,7 +2175,7 @@ namespace binfilter { /*N*/ double fZPos = (double)nZExtrude / 2.0; /*N*/ DataDescription* pDescr=aDescr.Insert(nCol,nRow,aDataPointAttr,Point(0,0),FALSE,CHADJUST_BOTTOM_CENTER,pChartYAxis); /*N*/ if(pDescr) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 Segment3DDescr(*pDescr,aPieRect,nStartAngle,nEndAngle,0,aPieRect.GetWidth()/2,aPieRect.GetWidth()/2,fZPos); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 Segment3DDescr(*pDescr,aPieRect,nStartAngle,nEndAngle,0,aPieRect.GetWidth()/2,aPieRect.GetWidth()/2,fZPos); /*N*/ } /*N*/ } /*N*/ } diff --git a/binfilter/bf_sch/source/core/sch_chtmode1.cxx b/binfilter/bf_sch/source/core/sch_chtmode1.cxx index f3cf6f4f3..ccc655851 100644 --- a/binfilter/bf_sch/source/core/sch_chtmode1.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmode1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chtmode1.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -882,7 +882,7 @@ namespace binfilter { /*N*/ /*N*/ if(pLogBook) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if(pLogBook->IsValid()) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if(pLogBook->IsValid()) //STRIP001 /*?*/ { //STRIP001 /*?*/ pLogBook->SetColMode(bSwitchData); //STRIP001 /*?*/ @@ -1288,7 +1288,7 @@ namespace binfilter { /*N*/ { /*?*/ if ( nLines > MAXLEGENDLINES ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 long nHeightOfRows = GetHeightOfnRows (rTextAttr, MAXLEGENDLINES);//war mal 2 statt MAX...#50395# +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 long nHeightOfRows = GetHeightOfnRows (rTextAttr, MAXLEGENDLINES);//war mal 2 statt MAX...#50395# //STRIP001 /*?*/ aSize.Height() = nHeightOfRows; //STRIP001 /*?*/ //STRIP001 /*?*/ if(nDegrees) @@ -1319,7 +1319,7 @@ namespace binfilter { /*?*/ } /*?*/ if(nActLines>nLines) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 nActLines=Min((ULONG)MAXLEGENDLINES,nActLines); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 nActLines=Min((ULONG)MAXLEGENDLINES,nActLines); //STRIP001 /*?*/ long nHeightOfRows = GetHeightOfnRows (rTextAttr,nActLines); //STRIP001 /*?*/ aSize.Height() = nHeightOfRows; //STRIP001 /*?*/ diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx index 2ffb65c97..26707dd43 100644 --- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chtmode2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -688,7 +688,7 @@ enum ChartStyleV0 /*N*/ } /*N*/ else //i >= nCnt /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (pRegressNr [i - nCnt]) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pRegressNr [i - nCnt]) //STRIP001 /*?*/ { //STRIP001 /*?*/ XPolygon aLine(2); //STRIP001 /*?*/ diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx index c41b50f89..ab271f873 100644 --- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chtmode3.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -466,7 +466,7 @@ namespace binfilter { /*N*/ } /*N*/ else /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 PutAxisAttr(rAttr,bMerge); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 PutAxisAttr(rAttr,bMerge); //STRIP001 /*?*/ return SetAllAxisAttributes (); /*N*/ } /*N*/ } @@ -1668,7 +1668,7 @@ namespace binfilter { /*N*/ /*N*/ SfxItemSet* pItemSet = pAttrList->GetObject(nCol * GetRowCount() + nRow); /*N*/ if (pItemSet != NULL) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ClearDblItems(rAttr,*pItemSet); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ClearDblItems(rAttr,*pItemSet); /*N*/ } /************************************************************************* |* @@ -2174,7 +2174,7 @@ namespace binfilter { /*N*/ pItemSet->GetItemState( SCHATTR_TEXT_ORIENT, FALSE, &pPoolItem ) == SFX_ITEM_SET && /*N*/ SAL_STATIC_CAST( const SvxChartTextOrientItem*, pPoolItem )->GetValue() == CHTXTORIENT_STACKED ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aTitle = UnstackString( aTitle ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aTitle = UnstackString( aTitle ); /*N*/ } /*N*/ /*N*/ if( pStrToChange ) @@ -2217,7 +2217,7 @@ namespace binfilter { /*N*/ case CHOBJID_DIAGRAM_SPECIAL_GROUP: /*N*/ case CHOBJID_DIAGRAM_ROWGROUP: /*N*/ case CHOBJID_LEGEND_SYMBOL_ROW: -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SchDataRow* pDataRow = GetDataRow(*pObj); //STRIP001 /*?*/ if(pDataRow) //STRIP001 /*?*/ { @@ -2236,7 +2236,7 @@ namespace binfilter { /*?*/ /*?*/ case CHOBJID_DIAGRAM_DATA: /*?*/ case CHOBJID_LEGEND_SYMBOL_COL: -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SchDataPoint* pDataPoint = GetDataPoint(*pObj); //STRIP001 /*?*/ if(pDataPoint) //STRIP001 /*?*/ { @@ -2254,7 +2254,7 @@ namespace binfilter { /*?*/ case CHOBJID_DIAGRAM_STATISTICS_GROUP : /*?*/ case CHOBJID_DIAGRAM_AVERAGEVALUE : /*?*/ case CHOBJID_DIAGRAM_REGRESSION : -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 //STRIP001 /*?*/ if(bReplaceAll) //STRIP001 /*?*/ GetAttr(pObj).ClearItem(); //STRIP001 /*?*/ GetAttr(pObj).Put(rAttr,TRUE); @@ -2789,7 +2789,7 @@ Fehlen evtl. noch in GetAttr(ID): /*N*/ } /*N*/ break; /*N*/ case CHOBJID_AREA: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ChangeDiagramAreaAttr( rAttr ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ChangeDiagramAreaAttr( rAttr ); /*?*/ break; /*N*/ default: /*N*/ GetAttr(nId,nIndex1).Put(rAttr,TRUE); diff --git a/binfilter/bf_sch/source/core/sch_chtmode5.cxx b/binfilter/bf_sch/source/core/sch_chtmode5.cxx index 6401f9092..0b7d5e739 100644 --- a/binfilter/bf_sch/source/core/sch_chtmode5.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmode5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chtmode5.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:24 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -179,7 +179,7 @@ namespace binfilter { /*N*/ SdrObject* ChartModel::GetDataRowObj(long nRow) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 SdrPage* pPage = GetPage(0); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 SdrPage* pPage = GetPage(0); //STRIP001 /*?*/ DBG_ASSERT(pPage, "ChartModel::GetDataRowObj:Keine Seite vorhanden!"); //STRIP001 /*?*/ //STRIP001 /*?*/ SdrObjGroup* pDiagram = diff --git a/binfilter/bf_sch/source/core/sch_chtmode9.cxx b/binfilter/bf_sch/source/core/sch_chtmode9.cxx index 6d0aa9190..bc637e5cb 100644 --- a/binfilter/bf_sch/source/core/sch_chtmode9.cxx +++ b/binfilter/bf_sch/source/core/sch_chtmode9.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_chtmode9.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -712,7 +712,7 @@ namespace binfilter { /*N*/ aObjRect.Justify(); /*N*/ /*N*/ if (!nCol && ((const SfxBoolItem &) rDataRowAttr.Get (SCHATTR_STAT_AVERAGE)).GetValue ()) - {DBG_ASSERT(0, "STRIP"); }//STRIP001 pList->NbcInsertObject(AverageValueY(nRow,FALSE,aRect, + {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pList->NbcInsertObject(AverageValueY(nRow,FALSE,aRect, //STRIP001 /*?*/ pAxis->CalcFact(GetAverageValueY(nRow)))); /*N*/ /*N*/ if (bShow && ((!bLogarithm && (fData != DBL_MIN)) || @@ -780,7 +780,7 @@ namespace binfilter { /*N*/ if ((SvxChartKindError) /*N*/ ((const SfxInt32Item &) aDataPointAttr.Get (SCHATTR_STAT_KIND_ERROR)).GetValue () != /*N*/ CHERROR_NONE) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 AverageErrorY(nRow,fData,aObjRect.TopCenter(),FALSE,aDataPointAttr,pStatLists[nRow],pAxis); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 AverageErrorY(nRow,fData,aObjRect.TopCenter(),FALSE,aDataPointAttr,pStatLists[nRow],pAxis); /*N*/ /*N*/ if(aDescr.Enabled()) /*N*/ { @@ -935,7 +935,7 @@ namespace binfilter { /*N*/ aObjRect.Justify(); /*N*/ /*N*/ if (!nCol && ((const SfxBoolItem &) rDataRowAttr.Get (SCHATTR_STAT_AVERAGE)).GetValue ()) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pList->NbcInsertObject (AverageValueY (nRow, TRUE, aRect, +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pList->NbcInsertObject (AverageValueY (nRow, TRUE, aRect, //STRIP001 /*?*/ pAxis->CalcFact(GetAverageValueY (nRow)))); /*N*/ /*N*/ if ((bShow) && ((!bLogarithm && (fData != DBL_MIN)) || @@ -946,7 +946,7 @@ namespace binfilter { /*N*/ if ((SvxChartKindError) /*N*/ ((const SfxInt32Item &) aDataPointAttr.Get (SCHATTR_STAT_KIND_ERROR)).GetValue () != /*N*/ CHERROR_NONE) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 AverageErrorY(nRow,fData, aObjRect.RightCenter(),TRUE,aDataPointAttr,pStatLists[nRow],pAxis); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 AverageErrorY(nRow,fData, aObjRect.RightCenter(),TRUE,aDataPointAttr,pStatLists[nRow],pAxis); /*N*/ /*N*/ if(aDescr.Enabled()) /*N*/ { @@ -1254,7 +1254,7 @@ namespace binfilter { /*N*/ //Statistik: /*N*/ if ( ((const SfxBoolItem &) rDataRowAttr.Get (SCHATTR_STAT_AVERAGE)).GetValue ()) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if(!pStatList) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if(!pStatList) //STRIP001 /*?*/ { //STRIP001 /*?*/ pStatGroup=(SchObjGroup*)CreateSimpleGroup(CHOBJID_DIAGRAM_STATISTICS_GROUP,TRUE,TRUE); //STRIP001 /*?*/ pStatGroup->InsertUserData(new SchDataRow(nRow)); @@ -1285,7 +1285,7 @@ namespace binfilter { /*N*/ ((const SfxInt32Item &) aDataPointAttr.Get (SCHATTR_STAT_KIND_ERROR)).GetValue () != /*N*/ CHERROR_NONE) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if(!pStatList) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if(!pStatList) //STRIP001 /*?*/ { //STRIP001 /*?*/ pStatGroup=(SchObjGroup*)CreateSimpleGroup(CHOBJID_DIAGRAM_STATISTICS_GROUP,TRUE,TRUE); //STRIP001 /*?*/ pStatGroup->InsertUserData(new SchDataRow(nRow)); @@ -1302,7 +1302,7 @@ namespace binfilter { /*N*/ /*N*/ if((eDescr!=CHDESCR_NONE)&&bShowDataDescr) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DataDescription aDescr; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DataDescription aDescr; //STRIP001 /*?*/ ClearDataDescription(&aDescr,1); //STRIP001 /*?*/ aDescr.eDescr = eDescr; //STRIP001 /*?*/ aDescr.bSymbol=((const SfxBoolItem&)aDataPointAttr.Get(SCHATTR_DATADESCR_SHOW_SYM)).GetValue(); @@ -1434,7 +1434,7 @@ namespace binfilter { /*N*/ if( ! bStacked ) /*N*/ { /*N*/ if (((const SfxBoolItem &) rDataRowAttr.Get (SCHATTR_STAT_AVERAGE)).GetValue ()) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pList->NbcInsertObject (AverageValueY (nRow, FALSE, aRect, +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pList->NbcInsertObject (AverageValueY (nRow, FALSE, aRect, //STRIP001 /*?*/ pAxis->CalcFact(GetAverageValueY (nRow)))); /*N*/ } /*N*/ @@ -1489,7 +1489,7 @@ namespace binfilter { /*N*/ { /*N*/ if ((SvxChartKindError) /*N*/ ((const SfxInt32Item &)aDataPointAttr.Get(SCHATTR_STAT_KIND_ERROR)).GetValue () != CHERROR_NONE) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 AverageErrorY(nRow,fData,aPolygon[nPoints -1],FALSE,aDataPointAttr,pStatLists[nRow],pAxis); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 AverageErrorY(nRow,fData,aPolygon[nPoints -1],FALSE,aDataPointAttr,pStatLists[nRow],pAxis); /*N*/ } /*N*/ /*N*/ if(aDescr.Enabled()) @@ -1904,18 +1904,18 @@ namespace binfilter { /*N*/ { /*N*/ if( pChartXAxis->TranslateMergedNumFormat( pTransTable ) && /*N*/ nXLastNumFmt >= 0 ) -/*N*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nXLastNumFmt = pChartXAxis->GetNumFormat(); +/*N*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nXLastNumFmt = pChartXAxis->GetNumFormat(); /*N*/ /*N*/ if( pChartYAxis->TranslateMergedNumFormat( pTransTable ) && /*N*/ nYLastNumFmt >= 0 ) -/*N*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nYLastNumFmt = pChartYAxis->GetNumFormat(); +/*N*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nYLastNumFmt = pChartYAxis->GetNumFormat(); /*N*/ /*N*/ pChartZAxis->TranslateMergedNumFormat( pTransTable ); /*N*/ pChartAAxis->TranslateMergedNumFormat( pTransTable ); /*N*/ /*N*/ if( pChartBAxis->TranslateMergedNumFormat( pTransTable ) && /*N*/ nBLastNumFmt >= 0 ) -/*N*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nBLastNumFmt = pChartBAxis->GetNumFormat(); +/*N*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nBLastNumFmt = pChartBAxis->GetNumFormat(); /*N*/ } /*N*/ void ChartModel::SetNumLinesColChart(const long nSet, BOOL bForceStyleChange) diff --git a/binfilter/bf_sch/source/core/sch_datalog.cxx b/binfilter/bf_sch/source/core/sch_datalog.cxx index 95b7445c8..19570a57d 100644 --- a/binfilter/bf_sch/source/core/sch_datalog.cxx +++ b/binfilter/bf_sch/source/core/sch_datalog.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_datalog.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ namespace binfilter { //STRIP001 return mbColChanged; //STRIP001 } /*N*/ SchDataLogBook::SchDataLogBook(const SchMemChart& aMemChart) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 mnColsAdded=0; //STRIP001 mnRowsAdded=0; //STRIP001 mbGetCol=TRUE; //Achtung, nur damit es ueberhaupt definiert ist! @@ -119,7 +119,7 @@ namespace binfilter { //STRIP001 } /*N*/ } /*N*/ SchDataLogBook::~SchDataLogBook() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(mpColCoordinates) //STRIP001 delete [] mpColCoordinates; //STRIP001 diff --git a/binfilter/bf_sch/source/core/sch_datapoin.cxx b/binfilter/bf_sch/source/core/sch_datapoin.cxx index 0a1fc4c86..9ef616486 100644 --- a/binfilter/bf_sch/source/core/sch_datapoin.cxx +++ b/binfilter/bf_sch/source/core/sch_datapoin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_datapoin.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -166,7 +166,7 @@ namespace binfilter { /*N*/ SdrObjUserData* SchDataPoint::Clone(SdrObject *pObj) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL; //STRIP001 return new SchDataPoint(*this); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; //STRIP001 return new SchDataPoint(*this); /*N*/ } /************************************************************************* diff --git a/binfilter/bf_sch/source/core/sch_datarow.cxx b/binfilter/bf_sch/source/core/sch_datarow.cxx index ddbf74cb6..413d2e22b 100644 --- a/binfilter/bf_sch/source/core/sch_datarow.cxx +++ b/binfilter/bf_sch/source/core/sch_datarow.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_datarow.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,7 +161,7 @@ namespace binfilter { /*N*/ SdrObjUserData* SchDataRow::Clone(SdrObject *pObj) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchDataRow(*this); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchDataRow(*this); /*N*/ } /************************************************************************* diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx b/binfilter/bf_sch/source/core/sch_globfunc.cxx index f925e3efa..38d8c7ace 100644 --- a/binfilter/bf_sch/source/core/sch_globfunc.cxx +++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_globfunc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:27 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1126,7 +1126,7 @@ namespace binfilter { /*N*/ long nHeight, /*N*/ double a, /*N*/ double b) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 long nAngleDiff; //STRIP001 long nAngleHook; //STRIP001 @@ -1183,7 +1183,7 @@ namespace binfilter { /*N*/ long nStartAng, /*N*/ long nEndAng, /*N*/ double fRadius) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // Calculate the radial line on which the desctiption will be positioned. //STRIP001 long nAngleHook; //STRIP001 if (nStartAng > nEndAng) diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx index 36ae95897..29e66ff61 100644 --- a/binfilter/bf_sch/source/core/sch_memchrt.cxx +++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_memchrt.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-20 04:58:53 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -392,12 +392,12 @@ namespace binfilter { /*N*/ /*N*/ //aNewInfo der Translationstabelle anpassen /*N*/ if(nTranslated == TRANS_ROW) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 aNewInfo.nRow=GetTableIndexRow(aInfo.nRow); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aNewInfo.nRow=GetTableIndexRow(aInfo.nRow); /*N*/ else if(nTranslated == TRANS_COL) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 aNewInfo.nCol=GetTableIndexCol(aInfo.nCol); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 aNewInfo.nCol=GetTableIndexCol(aInfo.nCol); /*N*/ /*N*/ if(aNewInfo == aSelectionInfo || aNewInfo.nSelection==0) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 return nLastSelInfoReturn; //reduzieren doppelter Selektionen bzw. speziell der Deselektion! +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 return nLastSelInfoReturn; //reduzieren doppelter Selektionen bzw. speziell der Deselektion! /*N*/ aSelectionInfo = aNewInfo; /*N*/ if(aAppLink.IsSet()) /*N*/ { @@ -1251,7 +1251,7 @@ using namespace ::com::sun::star; /*?*/ /*?*/ // quote table name if it contains spaces or quotes /*?*/ if( bNeedsQuoting ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // leading quote //STRIP001 /*?*/ aBuffer.append( aQuote ); //STRIP001 /*?*/ diff --git a/binfilter/bf_sch/source/core/sch_objadj.cxx b/binfilter/bf_sch/source/core/sch_objadj.cxx index 7dc548f9b..1575c67a8 100644 --- a/binfilter/bf_sch/source/core/sch_objadj.cxx +++ b/binfilter/bf_sch/source/core/sch_objadj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_objadj.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -134,7 +134,7 @@ namespace binfilter { /*N*/ SdrObjUserData* SchObjectAdjust::Clone(SdrObject *pObj) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchObjectAdjust(*this); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchObjectAdjust(*this); /*N*/ } /************************************************************************* diff --git a/binfilter/bf_sch/source/core/sch_objfac.cxx b/binfilter/bf_sch/source/core/sch_objfac.cxx index f3aeff01f..6f9e96103 100644 --- a/binfilter/bf_sch/source/core/sch_objfac.cxx +++ b/binfilter/bf_sch/source/core/sch_objfac.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_objfac.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -127,7 +127,7 @@ namespace binfilter { /*N*/ break; /*N*/ /*N*/ case SCH_LIGHTFACTOR_ID: -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pObjFactory->pNewData = new SchLightFactor; +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pObjFactory->pNewData = new SchLightFactor; /*?*/ DBG_ERROR("SCH_LIGHTFACTOR_ID no longer available"); /*?*/ break; /*N*/ diff --git a/binfilter/bf_sch/source/core/sch_objid.cxx b/binfilter/bf_sch/source/core/sch_objid.cxx index abd252e9f..b43817ebc 100644 --- a/binfilter/bf_sch/source/core/sch_objid.cxx +++ b/binfilter/bf_sch/source/core/sch_objid.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_objid.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,7 +195,7 @@ namespace binfilter { /*N*/ SdrObjUserData* SchObjectId::Clone(SdrObject *pObj) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchObjectId(*this); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchObjectId(*this); /*N*/ } /************************************************************************* diff --git a/binfilter/bf_sch/source/ui/app/sch_schdll.cxx b/binfilter/bf_sch/source/ui/app/sch_schdll.cxx index cca30a9c8..5aa92d3cb 100644 --- a/binfilter/bf_sch/source/ui/app/sch_schdll.cxx +++ b/binfilter/bf_sch/source/ui/app/sch_schdll.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_schdll.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:50 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,7 +185,7 @@ namespace binfilter { /*N*/ extern_c void __LOADONCALLAPI SchSetTransparent( SvInPlaceObjectRef aIPObj, BOOL bTransp ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SchChartDocShellRef aSchChartDocShellRef = &aIPObj; //STRIP001 //STRIP001 if (aSchChartDocShellRef.Is()) @@ -279,7 +279,7 @@ namespace binfilter { /*N*/ rDoc.PutAttr(rAttr); /*N*/ /*N*/ if( pOut ) -/*N*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 aSchChartDocShellRef->UpdateChart(pOut); +/*N*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aSchChartDocShellRef->UpdateChart(pOut); /*N*/ else /*N*/ rDoc.BuildChart(TRUE); /*N*/ } @@ -300,7 +300,7 @@ namespace binfilter { /*N*/ SfxItemSet& rOutAttrs, /*N*/ BOOL bPrePage) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 DBG_ASSERT(pData, "Kein Chart-Datenobjekt angegeben!"); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 DBG_ASSERT(pData, "Kein Chart-Datenobjekt angegeben!"); //STRIP001 //STRIP001 if(!pData)return NULL; //STRIP001 return new SchDiagramAutoPilotDlg( pParent, *new SchMemChart(*pData), rInAttrs, @@ -316,7 +316,7 @@ namespace binfilter { /*N*/ extern_c void __LOADONCALLAPI SchChangeChartData(ModalDialog* pDlg, /*N*/ SchMemChart* pData) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT(pData, "Kein Chart-Datenobjekt angegeben!"); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT(pData, "Kein Chart-Datenobjekt angegeben!"); //STRIP001 //STRIP001 ((SchDiagramAutoPilotDlg*)pDlg)->ChangeChartData(*new SchMemChart(*pData)); /*N*/ } @@ -372,7 +372,7 @@ namespace binfilter { /*N*/ extern_c SchMemChart* __LOADONCALLAPI SchNewMemChartNone () /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP");return NULL; //STRIP001 return new SchMemChart; +/*N*/ DBG_BF_ASSERT(0, "STRIP");return NULL; //STRIP001 return new SchMemChart; /*N*/ } /************************************************************************* @@ -394,7 +394,7 @@ namespace binfilter { /*N*/ extern_c SchMemChart* __LOADONCALLAPI SchNewMemChartCopy (const SchMemChart &rMemChart) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchMemChart (rMemChart); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchMemChart (rMemChart); /*N*/ } /************************************************************************* @@ -404,7 +404,7 @@ namespace binfilter { \************************************************************************/ /*N*/ extern_c ChartModel* __LOADONCALLAPI SchGetModel (SvInPlaceObjectRef aIPObj) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 //STRIP001 SchChartDocShellRef aSchChartDocShellRef = &aIPObj; //STRIP001 //STRIP001 if (aSchChartDocShellRef.Is()) return &aSchChartDocShellRef->GetDoc(); @@ -432,19 +432,19 @@ namespace binfilter { /*N*/ extern_c void __LOADONCALLAPI SchConvertChartRangeForCalc( /*N*/ SchMemChart& rMemChart, BOOL bOldToNew ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rMemChart.ConvertChartRangeForCalc( bOldToNew ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rMemChart.ConvertChartRangeForCalc( bOldToNew ); /*N*/ } /*N*/ extern_c void __LOADONCALLAPI SchMemChartResetTranslation( /*N*/ SchMemChart& rMemChart, long *pTable,long nCnt ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rMemChart.ResetTranslation( pTable, nCnt ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rMemChart.ResetTranslation( pTable, nCnt ); /*N*/ } /*N*/ extern_c void __LOADONCALLAPI SchMemChartUpdateTranslation( /*N*/ SchMemChart& rMemChart, long *pTable, long nCnt ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rMemChart.UpdateTranslation( pTable, nCnt ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rMemChart.UpdateTranslation( pTable, nCnt ); /*N*/ } /*N*/ extern_c void __LOADONCALLAPI SchMemChartInsertCols( SchMemChart& rMemChart, @@ -456,7 +456,7 @@ namespace binfilter { /*N*/ extern_c void __LOADONCALLAPI SchMemChartRemoveCols( SchMemChart& rMemChart, /*N*/ short nAtCol, short nCount) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rMemChart.RemoveCols( nAtCol, nCount ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rMemChart.RemoveCols( nAtCol, nCount ); /*N*/ } /*N*/ extern_c void __LOADONCALLAPI SchMemChartInsertRows( SchMemChart& rMemChart, @@ -468,19 +468,19 @@ namespace binfilter { /*N*/ extern_c void __LOADONCALLAPI SchMemChartRemoveRows( SchMemChart& rMemChart, /*N*/ short nAtRow, short nCount) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rMemChart.RemoveRows( nAtRow, nCount ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rMemChart.RemoveRows( nAtRow, nCount ); /*N*/ } /*N*/ extern_c void __LOADONCALLAPI SchMemChartSwapCols( SchMemChart& rMemChart, /*N*/ int nAtCol1, int nAtCol2) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rMemChart.SwapCols( nAtCol1, nAtCol2 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rMemChart.SwapCols( nAtCol1, nAtCol2 ); /*N*/ } /*N*/ extern_c void __LOADONCALLAPI SchMemChartSwapRows( SchMemChart& rMemChart, /*N*/ int nAtRow1,int nAtRow2) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rMemChart.SwapRows( nAtRow1, nAtRow2 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rMemChart.SwapRows( nAtRow1, nAtRow2 ); /*N*/ } diff --git a/binfilter/bf_sch/source/ui/app/sch_schmod.cxx b/binfilter/bf_sch/source/ui/app/sch_schmod.cxx index e05e01c20..3d78d3b3e 100644 --- a/binfilter/bf_sch/source/ui/app/sch_schmod.cxx +++ b/binfilter/bf_sch/source/ui/app/sch_schmod.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_schmod.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:32:50 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -207,7 +207,7 @@ namespace binfilter { void SchModule::Execute(SfxRequest& rReq) { - DBG_ASSERT(0, "STRIP");//STRIP001 switch (rReq.GetSlot()) + DBG_BF_ASSERT(0, "STRIP");//STRIP001 switch (rReq.GetSlot()) //STRIP001 { //STRIP001 case SID_START_APP: //STRIP001 if( GetFrame()) @@ -231,7 +231,7 @@ void SchModule::Execute(SfxRequest& rReq) /*?*/ void SchModule::GetState(SfxItemSet& rItemSet) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rItemSet.DisableItem(SID_CONFIGEVENT); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rItemSet.DisableItem(SID_CONFIGEVENT); /*?*/ } /************************************************************************* diff --git a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx index e3ab27c98..2ee1bf2e4 100644 --- a/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx +++ b/binfilter/bf_sch/source/ui/docshell/sch_docshell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sch_docshell.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mwu $ $Date: 2003-11-20 04:58:53 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -371,7 +371,7 @@ using namespace ::com::sun::star; /*?*/ void SchChartDocShell::Execute(SfxRequest& rReq) throw() /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 switch (rReq.GetSlot()) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 switch (rReq.GetSlot()) //STRIP001 { //STRIP001 case SID_CLOSEDOC: //STRIP001 SfxObjectShell::DoClose(); @@ -392,7 +392,7 @@ using namespace ::com::sun::star; /*?*/ void SchChartDocShell::GetState(SfxItemSet &rSet) throw() /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxWhichIter aIter(rSet); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxWhichIter aIter(rSet); //STRIP001 USHORT nWhich = aIter.FirstWhich(); //STRIP001 //STRIP001 while (nWhich) @@ -1116,7 +1116,7 @@ using namespace ::com::sun::star; /*N*/ if( pParent ) /*N*/ { /*?*/ // determine which is parent application -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SvGlobalName aGlobalName; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SvGlobalName aGlobalName; //STRIP001 /*?*/ ULONG nFileFormat; //STRIP001 /*?*/ String aAppName, aFullName, aShortName; //STRIP001 /*?*/ pParent->FillClass( &aGlobalName, &nFileFormat, diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx index 613750116..96c881491 100644 --- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx +++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sd_drawdoc.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -336,7 +336,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ (LANGUAGE_URDU == (eRealCTLLanguage & 0x00ff)) || /*N*/ (LANGUAGE_HEBREW == eRealCTLLanguage) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // ... then we have to set this as a default +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // ... then we have to set this as a default //STRIP001 /*?*/ SetDefaultWritingMode( ::com::sun::star::text::WritingMode_RL_TB ); /*N*/ } /*N*/ diff --git a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx index c495bd982..1ce4d1bb1 100644 --- a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx +++ b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sd_drawdoc2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:34:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -250,7 +250,7 @@ namespace binfilter { USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage) const { -/*?*/ {DBG_ASSERT(0, "STRIP");} return 0;//STRIP001 SdPage* pPage = NULL; +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 SdPage* pPage = NULL; //STRIP001 SdPage* pPageFound = NULL; //STRIP001 USHORT nPage = 0; //STRIP001 const USHORT nMaxPages = GetPageCount(); @@ -597,7 +597,7 @@ USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage // Inline has no advantages at such big code. IMPL_LINK( SdDrawDocument, NotifyUndoActionHdl, SfxUndoAction *, pUndoAction ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 #ifndef SVX_LIGHT + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 #ifndef SVX_LIGHT //STRIP001 if (pUndoAction) //STRIP001 { //STRIP001 if ( pDeletedPresObjList ) diff --git a/binfilter/bf_sd/source/core/sd_drawdoc3.cxx b/binfilter/bf_sd/source/core/sd_drawdoc3.cxx index 5639e12c6..7e8493b79 100644 --- a/binfilter/bf_sd/source/core/sd_drawdoc3.cxx +++ b/binfilter/bf_sd/source/core/sd_drawdoc3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sd_drawdoc3.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:34:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1519,7 +1519,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ /*N*/ if( bUndo ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ BegUndo(); //STRIP001 /*?*/ AddUndo( new SdrUndoDelPage( *pNotesMaster ) ); /*N*/ } @@ -1527,12 +1527,12 @@ using namespace ::com::sun::star; /*N*/ RemoveMasterPage( pNotesMaster->GetPageNum() ); /*N*/ /*N*/ if( bUndo ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 AddUndo(new SdrUndoDelPage(*pMaster)); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 AddUndo(new SdrUndoDelPage(*pMaster)); /*N*/ /*N*/ RemoveMasterPage( pMaster->GetPageNum() ); /*N*/ /*N*/ if( bUndo ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 EndUndo(); // schon hier, damit sich Joes Actions ZWISCHEN unsere eigenen schieben +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 EndUndo(); // schon hier, damit sich Joes Actions ZWISCHEN unsere eigenen schieben /*N*/ /*N*/ // alte Layoutvorlagen loeschen, wenn sie nicht mehr benoetigt werden /*N*/ BOOL bDeleteOldStyleSheets = TRUE; @@ -1548,7 +1548,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ /*N*/ if (bDeleteOldStyleSheets) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ List* pRemove = ((SdStyleSheetPool*) pStyleSheetPool)->CreateLayoutSheetList( aLayoutName ); //STRIP001 /*?*/ //STRIP001 /*?*/ if( bUndo ) @@ -1557,7 +1557,7 @@ using namespace ::com::sun::star; //STRIP001 /*?*/ SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction( this, pRemove, FALSE ); //STRIP001 /*?*/ //STRIP001 /*?*/ if (pUndoMgr) -//STRIP001 /*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pUndoMgr->AddUndoAction(pMovStyles); +//STRIP001 /*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pUndoMgr->AddUndoAction(pMovStyles); //STRIP001 /*?*/ } //STRIP001 /*?*/ //STRIP001 /*?*/ for ( SfxStyleSheet* pSheet = (SfxStyleSheet*)pRemove->First(); diff --git a/binfilter/bf_sd/source/core/sd_drawdoc4.cxx b/binfilter/bf_sd/source/core/sd_drawdoc4.cxx index 63ff939f6..1aeea99b2 100644 --- a/binfilter/bf_sd/source/core/sd_drawdoc4.cxx +++ b/binfilter/bf_sd/source/core/sd_drawdoc4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sd_drawdoc4.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:34:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -760,7 +760,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ if (bOnlineSpell && (bForceSpelling || bInitialOnlineSpellingEnabled) && /*N*/ pDocSh && !pDocSh->IsReadOnly() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 StopOnlineSpelling(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 StopOnlineSpelling(); //STRIP001 //STRIP001 /*?*/ SdOutliner* pOutl = GetInternalOutliner(TRUE); //STRIP001 @@ -785,7 +785,7 @@ using namespace ::com::sun::star::linguistic2; //STRIP001 /*?*/ for (USHORT nPage = 0; nPage < GetPageCount(); nPage++) //STRIP001 /*?*/ { //STRIP001 // Alle Pages durchsuchen -//STRIP001 /*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 FillOnlineSpellingList((SdPage*) GetPage(nPage)); +//STRIP001 /*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 FillOnlineSpellingList((SdPage*) GetPage(nPage)); //STRIP001 /*?*/ } //STRIP001 //STRIP001 /*?*/ for (nPage = 0; nPage < GetMasterPageCount(); nPage++) diff --git a/binfilter/bf_sd/source/core/sd_sdpage.cxx b/binfilter/bf_sd/source/core/sd_sdpage.cxx index e1352026a..6795678ef 100644 --- a/binfilter/bf_sd/source/core/sd_sdpage.cxx +++ b/binfilter/bf_sd/source/core/sd_sdpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sd_sdpage.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:34:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -333,7 +333,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ else if (eObjKind == PRESOBJ_GRAPHIC) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Graphic aGraphic ( SdResId(BMP_PRESOBJ_GRAPHIC) ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Graphic aGraphic ( SdResId(BMP_PRESOBJ_GRAPHIC) ); //STRIP001 /*?*/ OutputDevice &aOutDev = *Application::GetDefaultDevice(); //STRIP001 /*?*/ aOutDev.Push(); //STRIP001 /*?*/ @@ -349,27 +349,27 @@ using namespace ::com::sun::star; /*?*/ } /*N*/ else if (eObjKind == PRESOBJ_OBJECT) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); //STRIP001 /*?*/ Graphic aGraphic( SdResId(BMP_PRESOBJ_OBJECT) ); //STRIP001 /*?*/ ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); /*?*/ } /*N*/ else if (eObjKind == PRESOBJ_CHART) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); //STRIP001 /*?*/ ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarChart" ))); //STRIP001 /*?*/ Graphic aGraphic( SdResId(BMP_PRESOBJ_CHART) ); //STRIP001 /*?*/ ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); /*?*/ } /*N*/ else if (eObjKind == PRESOBJ_ORGCHART) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); //STRIP001 /*?*/ ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarOrg" ))); //STRIP001 /*?*/ Graphic aGraphic( SdResId(BMP_PRESOBJ_ORGCHART) ); //STRIP001 /*?*/ ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); /*?*/ } /*N*/ else if (eObjKind == PRESOBJ_TABLE) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); //STRIP001 /*?*/ ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarCalc" ))); //STRIP001 /*?*/ Graphic aGraphic( SdResId(BMP_PRESOBJ_TABLE) ); //STRIP001 /*?*/ ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); @@ -377,7 +377,7 @@ using namespace ::com::sun::star; /*?*/ #ifdef STARIMAGE_AVAILABLE /*?*/ else if (eObjKind == PRESOBJ_IMAGE) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pSdrObj = new SdrOle2Obj(); //STRIP001 /*?*/ ( (SdrOle2Obj*) pSdrObj)->SetProgName( String( RTL_CONSTASCII_USTRINGPARAM( "StarImage" ))); //STRIP001 /*?*/ Graphic aGraphic( SdResId(BMP_PRESOBJ_IMAGE) ); //STRIP001 /*?*/ ( (SdrOle2Obj*) pSdrObj)->SetGraphic(&aGraphic); @@ -648,7 +648,7 @@ using namespace ::com::sun::star; /*N*/ { /*N*/ if (!bMaster && /*N*/ aPresObjList.GetPos((void*) &rObj) != LIST_ENTRY_NOTFOUND) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // #107844# //STRIP001 // Handling of non-empty and empty PresObjs was moved to UndoActionHdl //STRIP001 // to allow adding the correct SdrUndoUserCallObj. This may be done here, too, diff --git a/binfilter/bf_sd/source/core/sd_sdpage2.cxx b/binfilter/bf_sd/source/core/sd_sdpage2.cxx index 247899e62..0e2138070 100644 --- a/binfilter/bf_sd/source/core/sd_sdpage2.cxx +++ b/binfilter/bf_sd/source/core/sd_sdpage2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sd_sdpage2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:39:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -688,7 +688,7 @@ using namespace ::com::sun::star; /*?*/ if (!pDocSh || pDocSh->GetMedium()->GetOrigURL() != aFileName) /*?*/ { /*?*/ // Keine Links auf Dokument-eigene Seiten! -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pPageLink = new SdPageLink(this, aFileName, aBookmarkName); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pPageLink = new SdPageLink(this, aFileName, aBookmarkName); //STRIP001 /*?*/ String aFilterName(SdResId(STR_IMPRESS)); //STRIP001 /*?*/ pLinkManager->InsertFileLink(*pPageLink, OBJECT_CLIENT_FILE, //STRIP001 /*?*/ aFileName, &aFilterName, &aBookmarkName); @@ -838,7 +838,7 @@ using namespace ::com::sun::star; /*N*/ sal_Bool SdPage::setAlienAttributes( const ::com::sun::star::uno::Any& rAttributes ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxItemSet* pSet = getOrCreateItems(); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxItemSet* pSet = getOrCreateItems(); //STRIP001 /*N*/ //STRIP001 /*N*/ SvXMLAttrContainerItem aAlienAttributes( SDRATTR_XMLATTRIBUTES ); //STRIP001 /*N*/ if( aAlienAttributes.PutValue( rAttributes, 0 ) ) diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx index 77f1dd298..34690c5ab 100644 --- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx +++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sd_unomodel.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-12-10 14:08:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1550,7 +1550,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r if( pOut ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 SdClientView* pView = new SdClientView( pDocShell, pOut, NULL ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SdClientView* pView = new SdClientView( pDocShell, pOut, NULL ); //STRIP001 Rectangle aVisArea( pDocShell->GetVisArea( ASPECT_DOCPRINT ) ); //STRIP001 Region aRegion( aVisArea ); //STRIP001 Point aOrigin; diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx index 53d571a66..c8cfbf5e6 100644 --- a/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx +++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sd_unopage.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:36:52 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -712,7 +712,7 @@ uno::Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyN } case WID_PAGE_LDBITMAP: { - DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bHC = Application::GetSettings().GetStyleSettings().GetWindowColor().IsDark(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bHC = Application::GetSettings().GetStyleSettings().GetWindowColor().IsDark(); //STRIP001 uno::Reference< awt::XBitmap > xBitmap( //STRIP001 VCLUnoHelper::CreateBitmap( BitmapEx( SdResId( bHC ? BMP_PAGE_H : BMP_PAGE ) ) ) ); //STRIP001 aAny <<= xBitmap; diff --git a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx index 0b1d199f8..384f1da8b 100644 --- a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx +++ b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sd_frmview.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-20 04:58:54 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -779,10 +779,10 @@ using namespace ::std; /*N*/ aUserData.addValue( sUNO_View_SnapLinesDrawing, makeAny( createHelpLinesString( GetStandardHelpLines() ) ) ); /*N*/ /*N*/ if( GetNotesHelpLines().GetCount() ) -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aUserData.addValue( sUNO_View_SnapLinesNotes, makeAny( createHelpLinesString( GetNotesHelpLines() ) ) ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aUserData.addValue( sUNO_View_SnapLinesNotes, makeAny( createHelpLinesString( GetNotesHelpLines() ) ) ); /*N*/ /*N*/ if( GetHandoutHelpLines().GetCount() ) -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aUserData.addValue( sUNO_View_SnapLinesHandout, makeAny( createHelpLinesString( GetHandoutHelpLines() ) ) ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aUserData.addValue( sUNO_View_SnapLinesHandout, makeAny( createHelpLinesString( GetHandoutHelpLines() ) ) ); /*N*/ /*N*/ aUserData.addValue( sUNO_View_RulerIsVisible, makeAny( (sal_Bool)HasRuler() ) ); /*N*/ aUserData.addValue( sUNO_View_PageKind, makeAny( (sal_Int16)GetPageKind() ) ); diff --git a/binfilter/bf_sfx2/source/appl/sfx2_app.cxx b/binfilter/bf_sfx2/source/appl/sfx2_app.cxx index eb06228d6..c436f07b9 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_app.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_app.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_app.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -292,7 +292,7 @@ static SfxPropertyHandler* pPropertyHandler = 0; /*N*/ } /*?*/ void SfxPropertyHandler::Property( ApplicationProperty& rProp ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 #if SUPD<613//MUSTINI //STRIP001 SfxApplication* pApp = SFX_APP(); //STRIP001 SfxIniManager* pIni = pApp->GetIniManager(); @@ -1624,7 +1624,7 @@ String GetURL_Impl( const String& rName ) /*N*/ } /*?*/ void SfxApplication::Invalidate( USHORT nId ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame ) ) //STRIP001 Invalidate_Impl( pFrame->GetBindings(), nId ); /*?*/ } diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx index c0951eb90..2f4379494 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_appbas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_appbas.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:00 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -746,7 +746,7 @@ SbxVariable* SfxConstants_Impl::Find //-------------------------------------------------------------------- /*?*/ Reference< XLibraryContainer > SfxApplication::GetBasicContainer() -/*?*/ {DBG_ASSERT(0, "STRIP"); Reference< XLibraryContainer > xRet; return xRet;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); Reference< XLibraryContainer > xRet; return xRet;//STRIP001 //STRIP001 Reference< XLibraryContainer > xRet //STRIP001 = static_cast< XLibraryContainer* >( pImp->pBasicLibContainer ); //STRIP001 return xRet; @@ -988,7 +988,7 @@ SbxVariable* SfxConstants_Impl::Find //------------------------------------------------------------------------- /*?*/ void SfxApplication::PropState_Impl( SfxItemSet &rSet ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SfxViewFrame *pFrame = SfxViewFrame::Current(); //STRIP001 SfxWhichIter aIter(rSet); //STRIP001 for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() ) @@ -1151,7 +1151,7 @@ SbxVariable* SfxConstants_Impl::Find //-------------------------------------------------------------------- /*N*/ void SfxApplication::MacroExec_Impl( SfxRequest& rReq ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_MEMTEST(); //STRIP001 if ( SfxMacroConfig::IsMacroSlot( rReq.GetSlot() ) ) //STRIP001 { @@ -1170,7 +1170,7 @@ SbxVariable* SfxConstants_Impl::Find //-------------------------------------------------------------------- /*N*/ void SfxApplication::MacroState_Impl( SfxItemSet& rSet ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_MEMTEST(); //STRIP001 //STRIP001 // Gestrichen, da zu teuer! Ausserdem waere ein EnterBasicCall noetig diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx index f519edf7f..7c50394ee 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_appcfg.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:27 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -290,7 +290,7 @@ const USHORT* SfxApplication::GetOptionsRanges() const //-------------------------------------------------------------------- /*?*/ BOOL SfxApplication::GetOptions( SfxItemSet& rSet ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 BOOL bRet = FALSE; //STRIP001 SfxItemPool &rPool = GetPool(); //STRIP001 String aTRUEStr = 0x0031; // ^= '1' @@ -1155,7 +1155,7 @@ const USHORT* SfxApplication::GetOptionsRanges() const //-------------------------------------------------------------------- /*?*/ void SfxApplication::SetOptions(const SfxItemSet &rSet) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SvtPathOptions aPathOptions; //STRIP001 //STRIP001 // Daten werden in DocInfo und IniManager gespeichert @@ -1325,7 +1325,7 @@ const USHORT* SfxApplication::GetOptionsRanges() const /*N*/ } /*N*/ /*N*/ if ( bAutoSave ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SaveAll_Impl( aSaveOptions.IsAutoSavePrompt(), TRUE ); //STRIP001 /*?*/ pImp->bAutoSaveNow = FALSE; //STRIP001 /*?*/ pImp->pAutoSaveTimer->SetTimeout( aSaveOptions.GetAutoSaveTime() * 60000 ); @@ -1402,7 +1402,7 @@ const USHORT* SfxApplication::GetOptionsRanges() const /*N*/ SfxMacroConfig* SfxApplication::GetMacroConfig() const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL; //STRIP001 return SfxMacroConfig::GetOrCreate(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; //STRIP001 return SfxMacroConfig::GetOrCreate(); /*N*/ } //-------------------------------------------------------------------- @@ -1435,7 +1435,7 @@ const USHORT* SfxApplication::GetOptionsRanges() const /*N*/ //(mba/task): Implementierung fehlt /*N*/ /*N*/ if ( !pCfgMgr->StoreConfiguration() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ HandleConfigError_Impl( (sal_uInt16)pCfgMgr->GetErrorCode() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ HandleConfigError_Impl( (sal_uInt16)pCfgMgr->GetErrorCode() ); /*N*/ /*N*/ ::utl::ConfigManager::GetConfigManager()->StoreConfigItems(); /*N*/ } diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appdata.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appdata.cxx index 05e089e07..dc34574c9 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_appdata.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_appdata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_appdata.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:27 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -208,7 +208,7 @@ namespace binfilter { /*N*/ if ( !pTemplates ) /*N*/ pTemplates = new SfxDocumentTemplates; /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pTemplates->ReInitFromComponent(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pTemplates->ReInitFromComponent(); /*N*/ return pTemplates; /*N*/ } diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx index 12794f4f4..78a89738d 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_appdde.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_appdde.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:01 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -341,7 +341,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) //STRIP001 Die Basisimplementierung f"uhrt nichts aus und liefert 0 zur"uck. //STRIP001 */ //STRIP001 -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 StarBASIC* pBasic = GetBasic(); //STRIP001 DBG_ASSERT( pBasic, "Wo ist mein Basic???" ) ; //STRIP001 SbxVariable* pRet = pBasic->Execute( rCmd ); @@ -372,7 +372,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) //STRIP001 Die Basisimplementierung liefert keine Daten und gibt 0 zur"uck. //STRIP001 */ //STRIP001 -{DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +{DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 return 0; /*?*/ } @@ -394,7 +394,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) Die Basisimplementierung nimmt keine Daten entgegen und liefert 0 zur"uck. */ /*?*/ -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 return 0; /*?*/ } @@ -413,7 +413,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) //STRIP001 Die Basisimplementierung erzeugt keinen und liefert 0 zur"uck. //STRIP001 */ //STRIP001 -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 return 0; /*?*/ } @@ -436,7 +436,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) //STRIP001 R"uckgabewerte k"onnen dabei leider nicht "ubertragen werden. //STRIP001 */ //STRIP001 -{DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +{DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if ( GetObjectShell() ) //STRIP001 return GetObjectShell()->DdeExecute( rCmd ); //STRIP001 @@ -461,7 +461,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) //STRIP001 Die Basisimplementierung liefert keine Daten und gibt 0 zur"uck. //STRIP001 */ //STRIP001 -{DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +{DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 return 0; /*?*/ } @@ -483,7 +483,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) //STRIP001 Die Basisimplementierung nimmt keine Daten entgegen und liefert 0 zur"uck. //STRIP001 */ //STRIP001 -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 return 0; /*?*/ } @@ -502,7 +502,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) //STRIP001 Die Basisimplementierung erzeugt keinen und liefert 0 zur"uck. //STRIP001 */ //STRIP001 -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 return 0; /*?*/ } @@ -607,7 +607,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) //-------------------------------------------------------------------- /*?*/ BOOL ImplDdeService::MakeTopic( const String& rNm ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 // Workaround gegen Event nach unserem Main() unter OS/2 //STRIP001 // passierte wenn man beim Beenden aus dem OffMgr die App neu startet //STRIP001 if ( !Application::IsInExecute() ) @@ -673,7 +673,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) /*?*/ } /*?*/ String ImplDdeService::Topics() -/*?*/ {DBG_ASSERT(0, "STRIP"); String aRet; return aRet;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); String aRet; return aRet;//STRIP001 //STRIP001 String sRet; //STRIP001 if( GetSysTopic() ) //STRIP001 sRet += GetSysTopic()->GetName(); @@ -696,21 +696,21 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) /*?*/ } /*?*/ BOOL ImplDdeService::SysTopicExecute( const String* pStr ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 return (BOOL)SFX_APP()->DdeExecute( *pStr ); /*?*/ } //-------------------------------------------------------------------- /*?*/ BOOL SfxDdeTriggerTopic_Impl::Execute( const String* pStr ) -{DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +{DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 // Application::GetAppWindow()->ToTop(TOTOP_RESTOREWHENMIN); //STRIP001 return TRUE; /*?*/ } //-------------------------------------------------------------------- /*?*/ DdeData* SfxDdeDocTopic_Impl::Get( ULONG nFormat ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 String sMimeType( SotExchange::GetFormatMimeType( nFormat )); //STRIP001 ::com::sun::star::uno::Any aValue; //STRIP001 long nRet = pSh->DdeGetData( GetCurItem(), sMimeType, aValue ); @@ -724,7 +724,7 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) /*?*/ } /*?*/ BOOL SfxDdeDocTopic_Impl::Put( const DdeData* pData ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 aSeq = ::com::sun::star::uno::Sequence< sal_Int8 >( //STRIP001 (sal_Int8*)(const void*)*pData, (long)*pData ); //STRIP001 BOOL bRet; @@ -741,19 +741,19 @@ SV_IMPL_PTRARR( SfxDdeDocTopics_Impl, SfxDdeDocTopic_Impl * const ) /*?*/ } /*?*/ BOOL SfxDdeDocTopic_Impl::Execute( const String* pStr ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 long nRet = pStr ? pSh->DdeExecute( *pStr ) : 0; //STRIP001 return 0 != nRet; /*?*/ } /*?*/ BOOL SfxDdeDocTopic_Impl::MakeItem( const String& rItem ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 AddItem( DdeItem( rItem ) ); //STRIP001 return TRUE; /*?*/ } /*?*/ BOOL SfxDdeDocTopic_Impl::StartAdviseLoop() -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 BOOL bRet = FALSE; //STRIP001 ::so3::SvLinkSource* pNewObj = pSh->DdeCreateLinkSource( GetCurItem() ); //STRIP001 if( pNewObj ) diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx index 6f651a3e5..32f1c6911 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_appmisc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_appmisc.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:27 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -244,7 +244,7 @@ public: /*?*/ SfxViewFrame* SfxApplication::CreateViewFrame( /*?*/ SfxObjectShell& rDoc, sal_uInt16 nViewId, sal_Bool bHidden ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 SfxItemSet *pSet = rDoc.GetMedium()->GetItemSet(); //STRIP001 if ( nViewId ) //STRIP001 pSet->Put( SfxUInt16Item( SID_VIEW_ID, nViewId ) ); @@ -623,7 +623,7 @@ extern String GetUserID(); /*N*/ // Wenn ein Sloteintrag vorhanden ist, aber keine oder eine fehlerhafte /*N*/ // SlotDatei, oder aber eine Slotdatei, aber kein Sloteintrag, dann /*N*/ // gilt dies als fehlerhafte Konfiguration -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 new SfxSpecialConfigError_Impl( String( SfxResId( RID_SPECIALCONFIG_ERROR ) ) ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 new SfxSpecialConfigError_Impl( String( SfxResId( RID_SPECIALCONFIG_ERROR ) ) ); /*N*/ } /*N*/ /*N*/ return pList; diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx index 5b6554ad5..e3a527fbc 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_appopen.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mba $ $Date: 2004-04-02 14:16:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -885,7 +885,7 @@ using namespace sfx2; /*N*/ if (pFrameItem) /*N*/ pFrame = pFrameItem->GetFrame(); /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 pFrame = (SfxFrame*)SfxTopFrame::Create(xDoc, nViewId, bHidden, pInternalArgs); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 pFrame = (SfxFrame*)SfxTopFrame::Create(xDoc, nViewId, bHidden, pInternalArgs); /*N*/ if ( pFrame ) /*N*/ { /*N*/ if ( pFrame->GetCurrentDocument() == xDoc || pFrame->PrepareClose_Impl( TRUE, TRUE ) == TRUE ) @@ -918,7 +918,7 @@ using namespace sfx2; //-------------------------------------------------------------------- /*?*/ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_MEMTEST(); //STRIP001 //STRIP001 // keine Parameter vom BASIC nur Factory angegeben? @@ -1030,7 +1030,7 @@ using namespace sfx2; //--------------------------------------------------------------------------- /*?*/ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 /*?*/ DBG_MEMTEST(); //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nSID = rReq.GetSlot(); diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx index fff451770..7cae81321 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_appuno.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:47 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1516,7 +1516,7 @@ static const String sDocumentTitle = String::CreateFromAscii( "DocumentTitle" ) /*?*/ ::com::sun::star::uno::Any SAL_CALL SfxMacroLoader::dispatchWithReturnValue( const ::com::sun::star::util::URL& aURL, /*?*/ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs ) throw (::com::sun::star::uno::RuntimeException) -/*?*/ {{DBG_ASSERT(0, "STRIP");} ::com::sun::star::uno::Any aRet; return aRet;//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");} ::com::sun::star::uno::Any aRet; return aRet;//STRIP001 //STRIP001 ::com::sun::star::uno::Any aRet; //STRIP001 ErrCode nErr = loadMacro( aURL.Complete, aRet, GetObjectShell_Impl() ); //STRIP001 return aRet; diff --git a/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx index 9da7ea9cb..02a7cb4a1 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_dlgcont.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:04 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,7 +169,7 @@ using namespace osl; /*N*/ } /*?*/ sal_Bool SAL_CALL SfxDialogLibraryContainer::isLibraryElementValid( Any aElement ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 Reference< XInputStreamProvider > xISP; //STRIP001 aElement >>= xISP; //STRIP001 sal_Bool bRet = xISP.is(); @@ -183,7 +183,7 @@ using namespace osl; /*?*/ Reference< XOutputStream > xOutput /*?*/ ) /*?*/ throw(Exception) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 Reference< XInputStreamProvider > xISP; //STRIP001 aElement >>= xISP; //STRIP001 if( !xISP.is() ) @@ -207,7 +207,7 @@ using namespace osl; /*?*/ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement /*?*/ ( const OUString& aFile, SotStorageStreamRef xElementStream ) -/*?*/ {DBG_ASSERT(0, "STRIP"); Any aAny; return aAny;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); Any aAny; return aAny;//STRIP001 //STRIP001 Any aRetAny; //STRIP001 //STRIP001 // TODO: Member because later it will be a component @@ -294,7 +294,7 @@ using namespace osl; /*?*/ void SAL_CALL SfxDialogLibraryContainer::initialize( const Sequence< Any >& aArguments ) /*?*/ throw (::com::sun::star::uno::Exception, /*?*/ ::com::sun::star::uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 sal_Int32 nArgCount = aArguments.getLength(); //STRIP001 OSL_ENSURE( nArgCount, "SfxDialogLibraryContainer::initialize() called with no arguments\n" ); //STRIP001 @@ -316,7 +316,7 @@ using namespace osl; /*N*/ SFX_IMPL_SINGLEFACTORY( SfxDialogLibraryContainer ) /*?*/ Sequence< OUString > SfxDialogLibraryContainer::impl_getStaticSupportedServiceNames() -/*?*/ {DBG_ASSERT(0, "STRIP");Sequence< OUString > seqServiceNames;return seqServiceNames; //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");Sequence< OUString > seqServiceNames;return seqServiceNames; //STRIP001 //STRIP001 static Sequence< OUString > seqServiceNames( 1 ); //STRIP001 static sal_Bool bNeedsInit = sal_True; //STRIP001 @@ -347,7 +347,7 @@ using namespace osl; /*N*/ Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::impl_createInstance /*N*/ ( const Reference< XMultiServiceFactory >& xServiceManager ) /*N*/ throw( Exception ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 //STRIP001 Reference< XInterface > xRet = //STRIP001 static_cast< XInterface* >( static_cast< OWeakObject* >(new SfxDialogLibraryContainer()) ); //STRIP001 return xRet; @@ -359,7 +359,7 @@ using namespace osl; /*N*/ SFX_IMPL_ONEINSTANCEFACTORY( SfxApplicationDialogLibraryContainer ) /*N*/ Sequence< OUString > SfxApplicationDialogLibraryContainer::impl_getStaticSupportedServiceNames() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ static Sequence< OUString > seqServiceNames( 1 ); //STRIP001 static sal_Bool bNeedsInit = sal_True; //STRIP001 @@ -390,7 +390,7 @@ using namespace osl; /*N*/ Reference< XInterface > SAL_CALL SfxApplicationDialogLibraryContainer::impl_createInstance /*N*/ ( const Reference< XMultiServiceFactory >& xServiceManager ) /*N*/ throw( Exception ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 //STRIP001 SFX_APP()->GetBasicManager(); //STRIP001 Reference< XInterface > xRet = //STRIP001 Reference< XInterface >( SFX_APP()->GetDialogContainer(), UNO_QUERY ); diff --git a/binfilter/bf_sfx2/source/appl/sfx2_module.cxx b/binfilter/bf_sfx2/source/appl/sfx2_module.cxx index f240166c4..5b1740b8d 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_module.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_module.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_module.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:06 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,14 +155,14 @@ public: //==================================================================== /*?*/ ModalDialog* SfxModule::CreateAboutDialog() -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 return SFX_APP()->CreateAboutDialog(); /*?*/ } //==================================================================== /*?*/ BOOL SfxModule::QueryUnload() -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 return TRUE; /*?*/ } @@ -472,7 +472,7 @@ SfxModule::SfxModule( ResMgr* pMgrP, BOOL bDummyP, /*N*/ }; /*?*/ void SfxModule::Invalidate( USHORT nId ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame ) ) //STRIP001 if ( pFrame->GetObjectShell()->GetModule() == this ) //STRIP001 Invalidate_Impl( pFrame->GetBindings(), nId ); diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx index 0f5ec46f9..caf515f10 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_namecont.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:06 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,7 +149,7 @@ namespace SfxContainer_Impl // Methods XElementAccess /*?*/ Type NameContainer_Impl::getElementType() /*?*/ throw(RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return mType;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return mType;//STRIP001 //STRIP001 return mType; /*?*/ } @@ -279,7 +279,7 @@ namespace SfxContainer_Impl /*?*/ void NameContainer_Impl::removeByName( const OUString& Name ) /*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 NameContainerNameMap::iterator aIt = mHashMap.find( Name ); //STRIP001 if( aIt == mHashMap.end() ) //STRIP001 { @@ -338,7 +338,7 @@ namespace SfxContainer_Impl /*?*/ void SAL_CALL NameContainer_Impl::removeContainerListener( const Reference< XContainerListener >& xListener ) /*?*/ throw (RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( !xListener.is() ) //STRIP001 throw RuntimeException(); //STRIP001 Reference< XInterface > xIface( xListener, UNO_QUERY ); @@ -386,7 +386,7 @@ namespace SfxContainer_Impl /*?*/ const OUString& rCheckFileName, /*?*/ const OUString& rCheckExtension, /*?*/ Reference< XSimpleFileAccess > xSFI ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 INetURLObject aTargetFolderInetObj( rTargetFolderInetObj ); //STRIP001 aTargetFolderInetObj.insertName( rCheckFileName, sal_True, INetURLObject::LAST_SEGMENT, //STRIP001 sal_True, INetURLObject::ENCODE_ALL ); @@ -697,7 +697,7 @@ namespace SfxContainer_Impl /*N*/ } /*N*/ } /*N*/ else if( !bStorage ) -/*N*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 /*N*/ // Write new index file immediately because otherwise /*N*/ // the library elements will be lost when storing into /*N*/ // the new info format @@ -794,7 +794,7 @@ namespace SfxContainer_Impl /*?*/ aFolder60 = aUserBasic60InetObj.GetMainURL( INetURLObject::NO_DECODE ); /*N*/ } /*N*/ if( mxSFI->isFolder( aFolder60 ) ) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 /*?*/ SfxLibraryContainer_Impl* pCont60 = createInstanceImpl(); //STRIP001 /*?*/ Reference< XInterface > xRef = static_cast< XInterface* >( static_cast< OWeakObject* >(pCont60) ); //STRIP001 /*?*/ @@ -1376,7 +1376,7 @@ namespace SfxContainer_Impl /*?*/ ( rLib.aName, xLibrariesStor, rLib.aName ); /*?*/ } /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SotStorageRef xLibraryStor; //STRIP001 /*?*/ if( bStorage ) //STRIP001 /*?*/ { @@ -1501,13 +1501,13 @@ namespace SfxContainer_Impl // Methods XElementAccess /*?*/ Type SfxLibraryContainer_Impl::getElementType() /*?*/ throw(RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); Type aType; return aType;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); Type aType; return aType;//STRIP001 //STRIP001 return maNameContainer.getElementType(); /*?*/ } /*?*/ sal_Bool SfxLibraryContainer_Impl::hasElements() /*?*/ throw(RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 sal_Bool bRet = maNameContainer.hasElements(); //STRIP001 return bRet; /*?*/ } @@ -1583,7 +1583,7 @@ namespace SfxContainer_Impl /*?*/ void SAL_CALL SfxLibraryContainer_Impl::removeLibrary( const OUString& Name ) /*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // Get and hold library before removing //STRIP001 Any aLibAny = maNameContainer.getByName( Name ) ; //STRIP001 Reference< XNameAccess > xNameAccess; @@ -1753,7 +1753,7 @@ namespace SfxContainer_Impl // Methods XLibraryContainer2 /*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryLink( const OUString& Name ) /*?*/ throw (NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( Name ); //STRIP001 sal_Bool bRet = pImplLib->mbLink; //STRIP001 return bRet; @@ -1761,7 +1761,7 @@ namespace SfxContainer_Impl /*?*/ OUString SAL_CALL SfxLibraryContainer_Impl::getLibraryLinkURL( const OUString& Name ) /*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); OUString aRetStr;return aRetStr;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); OUString aRetStr;return aRetStr;//STRIP001 //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( Name ); //STRIP001 sal_Bool bLink = pImplLib->mbLink; //STRIP001 if( !bLink ) @@ -1772,7 +1772,7 @@ namespace SfxContainer_Impl /*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryReadOnly( const OUString& Name ) /*?*/ throw (NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( Name ); //STRIP001 sal_Bool bRet = pImplLib->mbReadOnly || (pImplLib->mbLink && pImplLib->mbReadOnlyLink); //STRIP001 return bRet; @@ -1780,7 +1780,7 @@ namespace SfxContainer_Impl /*?*/ void SAL_CALL SfxLibraryContainer_Impl::setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) /*?*/ throw (NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( Name ); //STRIP001 if( pImplLib->mbLink ) //STRIP001 { @@ -1803,7 +1803,7 @@ namespace SfxContainer_Impl /*?*/ void SAL_CALL SfxLibraryContainer_Impl::renameLibrary( const OUString& Name, const OUString& NewName ) /*?*/ throw (NoSuchElementException, ElementExistException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 if( maNameContainer.hasByName( NewName ) ) //STRIP001 throw ElementExistException(); //STRIP001 @@ -1914,28 +1914,28 @@ namespace SfxContainer_Impl // Methods XLibraryContainerPassword /*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordProtected( const OUString& Name ) /*?*/ throw (NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 sal_Bool bRet = sal_False; //STRIP001 return bRet; /*?*/ } /*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::isLibraryPasswordVerified( const OUString& Name ) /*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL; +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL; //STRIP001 throw IllegalArgumentException(); /*?*/ } /*?*/ sal_Bool SAL_CALL SfxLibraryContainer_Impl::verifyLibraryPassword /*?*/ ( const OUString& Name, const OUString& Password ) /*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL; +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL; //STRIP001 throw IllegalArgumentException(); /*?*/ } /*?*/ void SAL_CALL SfxLibraryContainer_Impl::changeLibraryPassword( const OUString& Name, /*?*/ const OUString& OldPassword, const OUString& NewPassword ) /*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 throw IllegalArgumentException(); /*?*/ } @@ -2085,7 +2085,7 @@ namespace SfxContainer_Impl // Methods XElementAccess /*?*/ Type SfxLibrary_Impl::getElementType() /*?*/ throw(RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); Type aType; return aType; +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); Type aType; return aType; //STRIP001 return maNameContainer.getElementType(); /*?*/ } @@ -2120,7 +2120,7 @@ namespace SfxContainer_Impl // Methods XNameReplace /*?*/ void SfxLibrary_Impl::replaceByName( const OUString& aName, const Any& aElement ) /*?*/ throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( mbReadOnly || (mbLink && mbReadOnlyLink) ) //STRIP001 throw RuntimeException(); //STRIP001 @@ -2142,7 +2142,7 @@ namespace SfxContainer_Impl /*?*/ void SfxLibrary_Impl::removeByName( const OUString& Name ) /*?*/ throw(NoSuchElementException, WrappedTargetException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( mbReadOnly || (mbLink && mbReadOnlyLink) ) //STRIP001 throw RuntimeException(); //STRIP001 @@ -2173,7 +2173,7 @@ namespace SfxContainer_Impl // XTypeProvider /*?*/ Sequence< Type > SfxLibrary_Impl::getTypes() /*?*/ throw( RuntimeException ) -/*?*/ {DBG_ASSERT(0, "STRIP"); Sequence< Type > aSequence; return aSequence;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); Sequence< Type > aSequence; return aSequence;//STRIP001 //STRIP001 static OTypeCollection * s_pTypes_NameContainer = 0; //STRIP001 static OTypeCollection * s_pTypes_NameAccess = 0; //STRIP001 /* @@ -2215,7 +2215,7 @@ namespace SfxContainer_Impl /*?*/ Sequence< sal_Int8 > SfxLibrary_Impl::getImplementationId() /*?*/ throw( RuntimeException ) -/*?*/ {DBG_ASSERT(0, "STRIP"); Sequence< sal_Int8 > aSequence;return aSequence;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); Sequence< sal_Int8 > aSequence;return aSequence;//STRIP001 //STRIP001 static OImplementationId * s_pId_NameContainer = 0; //STRIP001 static OImplementationId * s_pId_NameAccess = 0; //STRIP001 /* @@ -2261,7 +2261,7 @@ namespace SfxContainer_Impl /*?*/ void SAL_CALL SfxLibrary_Impl::removeContainerListener( const Reference< XContainerListener >& xListener ) /*?*/ throw (RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 maNameContainer.removeContainerListener( xListener ); /*?*/ } diff --git a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx index 594c7e991..2c6cb0926 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_scriptcont.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,7 +152,7 @@ using namespace osl; // OldBasicPassword interface /*?*/ void SfxScriptLibraryContainer::setLibraryPassword /*?*/ ( const String& rLibraryName, const String& rPassword ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 try //STRIP001 { //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( rLibraryName ); @@ -176,7 +176,7 @@ using namespace osl; /*N*/ } /*?*/ void SfxScriptLibraryContainer::clearLibraryPassword( const String& rLibraryName ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 try //STRIP001 { //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( rLibraryName ); @@ -233,7 +233,7 @@ using namespace osl; /*N*/ } /*?*/ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryElementValid( Any aElement ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 OUString aMod; //STRIP001 aElement >>= aMod; //STRIP001 sal_Bool bRet = (aMod.getLength() > 0); @@ -247,7 +247,7 @@ using namespace osl; /*?*/ Reference< XOutputStream > xOutput /*?*/ ) /*?*/ throw(Exception) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // Create sax writer //STRIP001 Reference< XExtendedDocumentHandler > xHandler( //STRIP001 mxMSF->createInstance( @@ -341,7 +341,7 @@ using namespace osl; //STRIP001 } /*?*/ void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const ::rtl::OUString& aFile ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SotStorageRef xStorage = new SotStorage( sal_False, aFile ); //STRIP001 if( xStorage.Is() && xStorage->GetError() == ERRCODE_NONE ) //STRIP001 { @@ -368,7 +368,7 @@ using namespace osl; // Methods XLibraryContainerPassword /*?*/ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const OUString& Name ) /*?*/ throw (NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( Name ); //STRIP001 sal_Bool bRet = pImplLib->mbPasswordProtected; //STRIP001 return bRet; @@ -376,7 +376,7 @@ using namespace osl; /*?*/ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OUString& Name ) /*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE; +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( Name ); //STRIP001 if( !pImplLib->mbPasswordProtected ) //STRIP001 throw IllegalArgumentException(); @@ -387,7 +387,7 @@ using namespace osl; /*?*/ sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword /*?*/ ( const OUString& Name, const OUString& Password ) /*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE; +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( Name ); //STRIP001 if( !pImplLib->mbPasswordProtected || pImplLib->mbPasswordVerified ) //STRIP001 throw IllegalArgumentException(); @@ -423,7 +423,7 @@ using namespace osl; /*?*/ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& Name, /*?*/ const OUString& OldPassword, const OUString& NewPassword ) /*?*/ throw (IllegalArgumentException, NoSuchElementException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SfxLibrary_Impl* pImplLib = getImplLib( Name ); //STRIP001 if( OldPassword == NewPassword ) //STRIP001 return; @@ -545,7 +545,7 @@ using namespace osl; // Impl methods /*?*/ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary_Impl* pLib, /*?*/ const ::rtl::OUString& aName, SotStorageRef xStorage ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 BasicManager* pBasicMgr = getBasicManager(); //STRIP001 StarBASIC* pBasicLib = pBasicMgr->GetLib( aName ); //STRIP001 if( !pBasicLib ) @@ -732,7 +732,7 @@ using namespace osl; /*?*/ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary /*?*/ ( SfxLibrary_Impl* pLib, const OUString& Name, sal_Bool bVerifyPasswordOnly ) /*?*/ throw(WrappedTargetException, RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 sal_Bool bLink = pLib->mbLink; //STRIP001 sal_Bool bStorage = mxStorage.Is() && !bLink; //STRIP001 @@ -972,7 +972,7 @@ using namespace osl; /*?*/ void SAL_CALL SfxScriptLibraryContainer::initialize( const Sequence< Any >& aArguments ) /*?*/ throw (::com::sun::star::uno::Exception, /*?*/ ::com::sun::star::uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 sal_Int32 nArgCount = aArguments.getLength(); //STRIP001 OSL_ENSURE( nArgCount, "SfxDialogLibraryContainer::initialize() called with no arguments\n" ); //STRIP001 diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx index 44cf5187e..4f305e9fd 100644 --- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx +++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_fltfnc.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-05-04 15:16:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -407,7 +407,7 @@ public: //---------------------------------------------------------------- /*?*/ sal_uInt32 SfxFilterContainer::Execute( SfxMedium& rMedium, SfxFrame*& pFrame) const -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 return ERRCODE_ABORT; /*?*/ } @@ -818,7 +818,7 @@ public: //---------------------------------------------------------------- /*?*/ SfxFilterContainer* SfxFilterMatcher::GetContainer( const String &rName ) const -/*STRIP003*/{ // DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*STRIP003*/{ // DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 /*STRIP003*/ SfxFContainerList_Impl& rList = pImpl->aList; /*STRIP003*/ sal_uInt16 nCount = (sal_uInt16) rList.Count(); /*STRIP003*/ for( sal_uInt16 n = 0; n < nCount; n++ ) @@ -859,7 +859,7 @@ public: /*?*/ // FilterDetection nur "uber den Content /*?*/ return ERRCODE_NONE; /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pFilter = GetFilter4Mime( aMime, nMust, nDont ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pFilter = GetFilter4Mime( aMime, nMust, nDont ); /*?*/ /*?*/ if ( pFilter && aMime.EqualsAscii(CONTENT_TYPE_STR_APP_OCTSTREAM) ) /*?*/ { @@ -1075,7 +1075,7 @@ if( nErr == 1 || nErr == USHRT_MAX || nErr == ULONG_MAX ) \ /*N*/ /*N*/ // Jetzt einmal drueberiterieren und nur die perfekten Filter nehmen /*N*/ if( !pFilter ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // Achtung: hier k"onnte auch asynchron detected werden! //STRIP001 /*?*/ rMedium.StartDownload(); //STRIP001 /*?*/ if ( !rMedium.IsDownloadDone_Impl() ) @@ -1103,7 +1103,7 @@ if( nErr == 1 || nErr == USHRT_MAX || nErr == ULONG_MAX ) \ /*?*/ /*?*/ //DV !!!! don't close InStream when using the new Medium /*?*/ //rMedium.CloseInStream(); -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ rMedium.GetStorage(); //STRIP001 /*?*/ nErr = GetFilter4Content( rMedium, &pFilter, nMust, nDont ); //STRIP001 /*?*/ CHECKERROR(); diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx index 6c743bff6..fee5b6876 100644 --- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx +++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltlst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_fltlst.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:18 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -189,7 +189,7 @@ using namespace ::com::sun::star; //STRIP001 @last_change 16.10.2001 14:26 //STRIP001 *//*-*************************************************************************************************************/ /*?*/ SfxFilterListener::~SfxFilterListener() -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 if( m_xTypeCache.is() ) //STRIP001 { //STRIP001 m_xTypeCache->removeFlushListener( this ); @@ -225,7 +225,7 @@ using namespace ::com::sun::star; //STRIP001 @last_change 17.10.2001 10:28 //STRIP001 *//*-*************************************************************************************************************/ /*?*/ void SAL_CALL SfxFilterListener::flushed( const lang::EventObject& aSource ) throw( uno::RuntimeException ) -/*?*/ {{DBG_ASSERT(0, "STRIP"); }//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 //STRIP001 /* SAFE AREA ----------------------------------------------------------------------------------------------- */ //STRIP001 ::osl::ResettableMutexGuard aGuard( m_aMutex ); //STRIP001 @@ -259,7 +259,7 @@ using namespace ::com::sun::star; //STRIP001 @last_change 16.10.2001 14:30 //STRIP001 *//*-*************************************************************************************************************/ /*?*/ void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& aSource ) throw( uno::RuntimeException ) -/*?*/ {{DBG_ASSERT(0, "STRIP"); }//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 //STRIP001 /* SAFE AREA ----------------------------------------------------------------------------------------------- */ //STRIP001 ::osl::ResettableMutexGuard aGuard( m_aMutex ); //STRIP001 diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx index c7d02e9f2..c82eeb1b0 100644 --- a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx +++ b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_minarray.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-05-04 10:01:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -232,7 +232,7 @@ namespace binfilter { // ----------------------------------------------------------------------- /*?*/ BOOL SfxPtrArr::Replace( void* aOldElem, void* aNewElem ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 DBG_MEMTEST(); //STRIP001 // einfache Aufgaben ... //STRIP001 if ( nUsed == 0 ) @@ -625,7 +625,7 @@ namespace binfilter { // ----------------------------------------------------------------------- /*N*/ USHORT WordArr::Remove( USHORT nPos, USHORT nLen ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 DBG_MEMTEST(); //STRIP001 // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird //STRIP001 nLen = Min( (USHORT)(nUsed-nPos), nLen ); @@ -679,7 +679,7 @@ namespace binfilter { // ----------------------------------------------------------------------- /*N*/ BOOL WordArr::Remove( short aElem ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_MEMTEST(); //STRIP001 // einfache Aufgaben ... //STRIP001 if ( nUsed == 0 ) diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx index a0283c768..05373a97d 100644 --- a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx +++ b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_progress.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -245,7 +245,7 @@ extern ULONG Get10ThSec(); /*N*/ } /*N*/ } /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 SFX_APP()->LockDispatcher( !bEnable ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SFX_APP()->LockDispatcher( !bEnable ); /*N*/ } // ----------------------------------------------------------------------- @@ -326,7 +326,7 @@ extern ULONG Get10ThSec(); /*N*/ if ( pObjSh ) /*N*/ pObjSh->SetProgress_Impl(this); /*N*/ else if( !pImp->pActiveProgress ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 SFX_APP()->SetProgress_Impl(this); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SFX_APP()->SetProgress_Impl(this); /*N*/ Resume(); /*N*/ } @@ -385,7 +385,7 @@ extern ULONG Get10ThSec(); /*N*/ if ( pImp->xObjSh.Is() ) /*N*/ pImp->xObjSh->SetProgress_Impl(0); /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 SFX_APP()->SetProgress_Impl(0); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 SFX_APP()->SetProgress_Impl(0); /*N*/ if ( pImp->bLocked ) /*N*/ pImp->Enable_Impl(TRUE); /*N*/ } @@ -403,7 +403,7 @@ extern ULONG Get10ThSec(); angezeigt wird. */ -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( pImp->pActiveProgress ) return; //STRIP001 if ( pImp->pMgr && pImp->pMgr->IsProgressMode() ) //STRIP001 { @@ -467,7 +467,7 @@ static ULONG nLastTime = 0; // ----------------------------------------------------------------------- /*N*/ IMPL_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg*, pArg ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( !nLastTime ) //STRIP001 { //STRIP001 Timer *pTimer = new Timer(); diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx index be8bc0c07..e4ae3970a 100644 --- a/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx +++ b/binfilter/bf_sfx2/source/config/sfx2_cfgitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_cfgitem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:37 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ namespace binfilter { /*N*/ } /*?*/ void SfxConfigItem::ReConnect( SfxConfigManager* pMgr ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( m_pCfgMgr ) //STRIP001 { //STRIP001 if ( m_bModified ) @@ -146,7 +146,7 @@ namespace binfilter { /*?*/ } /*?*/ BOOL SfxConfigItem::ReInitialize() -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 //STRIP001 m_bInitialized = FALSE; //STRIP001 return Initialize(); /*?*/ } diff --git a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx index 8e76aee07..35776f218 100644 --- a/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx +++ b/binfilter/bf_sfx2/source/config/sfx2_cfgmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_cfgmgr.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:16 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -271,7 +271,7 @@ static const char pStorageName[] = "Configurations"; /*?*/ } /*?*/ void SfxConfigManager::SetModified(BOOL bMod) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 bModified = bMod; //STRIP001 if ( bMod && pObjShell) //STRIP001 pObjShell->SetModified( TRUE ); @@ -421,7 +421,7 @@ static const char pStorageName[] = "Configurations"; /*N*/ } /*?*/ BOOL SfxConfigManager::StoreConfiguration_Impl( SotStorage* pStorage ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ BOOL bRet = TRUE; //STRIP001 //STRIP001 // store directly into the destination storage @@ -587,7 +587,7 @@ static const char pStorageName[] = "Configurations"; /*N*/ } /*?*/ BOOL SfxConfigManager::StoreConfigItem( SfxConfigItem& rCItem ) -/*?*/ {DBG_ASSERT(0, "STRIP");return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE;//STRIP001 //STRIP001 DBG_ASSERT( m_xStorage.Is(), "No storage for configurations!" ); //STRIP001 if ( !m_xStorage.Is() ) //STRIP001 return FALSE; @@ -659,7 +659,7 @@ static const char pStorageName[] = "Configurations"; //STRIP001 } /*?*/ void SfxConfigManager::CopyConfigItem( SfxConfigManager& rMgr, USHORT nType ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 BOOL bIsDefault = TRUE; //STRIP001 for( USHORT i = 0; i < rMgr.pItemArr->Count(); ++i ) //STRIP001 { @@ -708,7 +708,7 @@ static const char pStorageName[] = "Configurations"; /*?*/ } /*?*/ void SfxConfigManager::RemovePersistentConfigItem( USHORT nType ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( USHORT i = 0; i < pItemArr->Count(); ++i ) //STRIP001 { //STRIP001 SfxConfigItem_Impl* pItem = (*pItemArr)[i]; @@ -742,7 +742,7 @@ static const char pStorageName[] = "Configurations"; /*?*/ } /*?*/ void SfxConfigManager::ReInitialize( USHORT nType ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( USHORT i = 0; i < pItemArr->Count(); ++i ) //STRIP001 { //STRIP001 SfxConfigItem_Impl* pItem = (*pItemArr)[i]; @@ -788,7 +788,7 @@ static const char pStorageName[] = "Configurations"; //STRIP001 } /*?*/ void SfxConfigManager::ReInitialize( SfxConfigItem* pCItem ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( USHORT i = 0; i < pItemArr->Count(); ++i ) //STRIP001 { //STRIP001 SfxConfigItem_Impl* pItem = (*pItemArr)[i]; @@ -811,7 +811,7 @@ static const char pStorageName[] = "Configurations"; /*?*/ } /*?*/ void SfxConfigManager::ResetConfigItem( USHORT nType ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( USHORT i = 0; i < pItemArr->Count(); ++i ) //STRIP001 { //STRIP001 SfxConfigItem_Impl* pItem = (*pItemArr)[i]; @@ -833,7 +833,7 @@ static const char pStorageName[] = "Configurations"; /*?*/ } /*?*/ void SfxConfigManager::ReConnect( USHORT nType, SfxConfigManager* pOther ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( USHORT i = 0; i < pItemArr->Count(); ++i ) //STRIP001 { //STRIP001 SfxConfigItem_Impl* pItem = (*pItemArr)[i]; diff --git a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx index 4e2f83839..9683c2a71 100644 --- a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx +++ b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_evntconf.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:30 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -166,7 +166,7 @@ public: /*?*/ SfxMacroQueryDlg_Impl::SfxMacroQueryDlg_Impl( const String& rMacName, BOOL bDefault ) : /*?*/ QueryBox( NULL, SfxResId( DLG_MACROQUERY ) ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetButtonText( GetButtonId(0), String( SfxResId(BTN_OK) ) ); //STRIP001 SetButtonText( GetButtonId(1), String( SfxResId(BTN_CANCEL) ) ); //STRIP001 @@ -208,7 +208,7 @@ public: // ----------------------------------------------------------------------- /*?*/ void SfxAsyncEvent_Impl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SfxSimpleHint* pHint = PTR_CAST( SfxSimpleHint, &rHint ); //STRIP001 if( pHint && pHint->GetId() == SFX_HINT_DYING && pTimer->IsActive() ) //STRIP001 { @@ -223,7 +223,7 @@ public: /*?*/ : aArgs( rArgs ) /*?*/ , pSh( pDoc ) /*?*/ , pMacro( pMac ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( pSh ) StartListening( *pSh ); //STRIP001 pTimer = new Timer; //STRIP001 pTimer->SetTimeoutHdl( LINK(this, SfxAsyncEvent_Impl, TimerHdl) ); @@ -241,7 +241,7 @@ public: // ----------------------------------------------------------------------- /*?*/ IMPL_LINK(SfxAsyncEvent_Impl, TimerHdl, Timer*, pTimer) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 pTimer->Stop(); //STRIP001 ScriptType eSType = pMacro->GetScriptType(); //STRIP001 BOOL bIsBasic = ( eSType == STARBASIC ); @@ -342,7 +342,7 @@ public: //========================================================================== /*?*/ String SfxEventConfiguration::GetEventName(USHORT nId) const -/*?*/ {DBG_ASSERT(0, "STRIP"); return String();//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return String();//STRIP001 //STRIP001 DBG_ASSERT(pEventArr,"Keine Events angemeldet!"); //STRIP001 USHORT nCount = pEventArr->Count(); //STRIP001 for (USHORT n=1; n<nCount; n++) @@ -360,7 +360,7 @@ public: //========================================================================== /*?*/ USHORT SfxEventConfiguration::GetEventId(const String& rName) const -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT(pEventArr,"Keine Events angemeldet!"); //STRIP001 USHORT nCount = pEventArr->Count(); //STRIP001 for (USHORT n=1; n<nCount; n++) @@ -404,7 +404,7 @@ public: /*?*/ USHORT nId, /*?*/ SfxObjectShell* pDoc /*?*/ ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 pDocEventConfig = pDoc ? pDoc->GetEventConfig_Impl() : NULL; //STRIP001 const SvxMacro* pMacro=NULL; //STRIP001 if ( pDocEventConfig ) @@ -419,7 +419,7 @@ public: /*?*/ USHORT nId, /*?*/ SfxObjectShell* pDoc /*?*/ ) const -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 DBG_ASSERT(pEventArr,"Keine Events angemeldet!"); //STRIP001 //STRIP001 SfxEventConfigItem_Impl *pDocEventConfig = pDoc ? pDoc->GetEventConfig_Impl() : NULL; @@ -516,7 +516,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr ) /*N*/ } /*?*/ BOOL SfxEventConfigItem_Impl::LoadXML( SvStream& rInStream ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 ::framework::EventsConfig aCfg; //STRIP001 if ( ::framework::EventsConfiguration::LoadEventsConfig( rInStream, aCfg ) ) //STRIP001 { @@ -540,7 +540,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr ) //========================================================================== /*?*/ BOOL SfxEventConfigItem_Impl::Store(SvStream& rStream) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 USHORT nWarn=0; //STRIP001 if ( bWarning ) //STRIP001 nWarn |= 0x01; @@ -552,7 +552,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr ) /*?*/ } /*?*/ BOOL SfxEventConfigItem_Impl::StoreXML( SvStream& rOutStream ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 // get the event names //STRIP001 ResStringArray aEventNames( SfxResId( EVENT_NAMES_ARY ) ); //STRIP001 long nNamesCount = aEventNames.Count(); @@ -630,7 +630,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr ) /*N*/ } /*?*/ int SfxEventConfigItem_Impl::Load( SotStorage& rStorage ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 SotStorageStreamRef xStream = rStorage.OpenSotStream( SfxEventConfigItem_Impl::GetStreamName(), STREAM_STD_READ ); //STRIP001 if ( xStream->GetError() ) //STRIP001 return SfxConfigItem::ERR_READ; @@ -650,7 +650,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr ) /*?*/ } /*?*/ BOOL SfxEventConfigItem_Impl::Store( SotStorage& rStorage ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 if ( pObjShell ) //STRIP001 // DocEventConfig is stored with the document //STRIP001 return TRUE; @@ -686,7 +686,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr ) /*N*/ } /*?*/ void SfxEventConfiguration::AddEvents( SfxMacroTabPage* pPage ) const -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT(pEventArr,"Keine Events angemeldet!"); //STRIP001 USHORT nCount = pEventArr->Count(); //STRIP001 for (USHORT n=1; n<nCount; n++) @@ -708,7 +708,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr ) /*N*/ } /*?*/ void SfxEventConfiguration::SetAppEventTable( const SvxMacroTableDtor& rTable ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 //GetAppEventConfig_Impl()->aMacroTable = rTable; //STRIP001 //pAppEventConfig->SetDefault(FALSE); //STRIP001 PropagateEvents_Impl( NULL, rTable ); @@ -716,7 +716,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr ) /*?*/ void SfxEventConfiguration::SetDocEventTable( SfxObjectShell *pDoc, /*?*/ const SvxMacroTableDtor& rTable ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pDoc ) //STRIP001 { //STRIP001 // if CfgMgr does not exist, create it, otherwise ConfigItem will not have a ConfigManager! @@ -814,7 +814,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr ) /*?*/ void SfxEventConfiguration::PropagateEvent_Impl( SfxObjectShell *pDoc, /*?*/ USHORT nId, /*?*/ const SvxMacro* pMacro ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 REFERENCE< XEVENTSSUPPLIER > xSupplier; //STRIP001 if ( pDoc ) //STRIP001 { diff --git a/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx b/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx index d6f7f1c90..f733e8de9 100644 --- a/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx +++ b/binfilter/bf_sfx2/source/config/sfx2_misccfg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_misccfg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:38 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ using namespace ::com::sun::star::uno; --------------------------------------------------------------------*/ /*?*/ void SfxMiscCfg::SetNotFoundWarning( BOOL bSet) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(bNotFound != bSet) //STRIP001 SetModified(); //STRIP001 bNotFound = bSet; @@ -114,7 +114,7 @@ using namespace ::com::sun::star::uno; --------------------------------------------------------------------*/ /*?*/ void SfxMiscCfg::SetPaperSizeWarning( BOOL bSet) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(bPaperSize != bSet) //STRIP001 SetModified(); //STRIP001 bPaperSize = bSet; @@ -124,7 +124,7 @@ using namespace ::com::sun::star::uno; Beschreibung: --------------------------------------------------------------------*/ /*?*/ void SfxMiscCfg::SetPaperOrientationWarning( BOOL bSet) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(bPaperOrientation != bSet) //STRIP001 SetModified(); //STRIP001 bPaperOrientation = bSet; @@ -134,7 +134,7 @@ using namespace ::com::sun::star::uno; --------------------------------------------------------------------*/ /*?*/ void SfxMiscCfg::SetYear2000( sal_Int32 nSet ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(nYear2000 != nSet) //STRIP001 SetModified(); //STRIP001 nYear2000 = nSet; @@ -200,7 +200,7 @@ using namespace ::com::sun::star::uno; ---------------------------------------------------------------------------*/ /*?*/ void SfxMiscCfg::Commit() -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const Sequence<OUString>& aNames = GetPropertyNames(); //STRIP001 const OUString* pNames = aNames.getConstArray(); //STRIP001 Sequence<Any> aValues(aNames.getLength()); diff --git a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx index d6e47cf07..e46713b28 100644 --- a/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx +++ b/binfilter/bf_sfx2/source/control/sfx2_macrconf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_macrconf.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -127,7 +127,7 @@ static const sal_uInt16 nVersion = 3; SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*N*/ SfxMacroConfig* SfxMacroConfig::GetOrCreate() -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); //STRIP001 if ( !pMacroConfig ) //STRIP001 pMacroConfig = new SfxMacroConfig; @@ -158,7 +158,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ SbMethod* SfxQueryMacro_Impl( BasicManager* pMgr , const String& rMacro, /*?*/ const String &rLibName, const String& rModule ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 IntlWrapper aIntlWrapper( ::legacy_binfilters::getLegacyProcessServiceFactory(), Application::GetSettings().GetLocale() ); //STRIP001 const CollatorWrapper* pCollator = aIntlWrapper.getCollator(); //STRIP001 sal_uInt16 nLibCount = pMgr->GetLibCount(); @@ -193,7 +193,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ } /*?*/ SbMethod* SfxQueryMacro( BasicManager* pMgr , const String& rMacro ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 sal_uInt16 nLast = 0; //STRIP001 String aMacro = rMacro; //STRIP001 String aLibName = aMacro.GetToken( 0, '.', nLast ); @@ -205,7 +205,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ ErrCode SfxCallMacro( BasicManager* pMgr, const String& rCode, /*?*/ SbxArray *pArgs, SbxValue *pRet ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 ErrCode nErr; //STRIP001 SfxApplication *pApp = SFX_APP(); //STRIP001 pApp->EnterBasicCall(); @@ -231,7 +231,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ nRefCnt(0), /*?*/ pSlot(0), /*?*/ pHelpText(0) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( rURL.CompareToAscii( "macro:", 6 ) == COMPARE_EQUAL ) //STRIP001 { //STRIP001 String aTmp = rURL.Copy( 6 ); @@ -289,7 +289,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ nRefCnt(0), /*?*/ pSlot(0), /*?*/ pHelpText(0) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 sal_uInt16 nCount = rQualifiedName.GetTokenCount('.'); //STRIP001 aMethodName = rQualifiedName.GetToken( nCount-1, '.' ); //STRIP001 if ( nCount > 1 ) @@ -323,7 +323,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; //========================================================================== /*?*/ sal_Bool SfxMacroInfo::operator==(const SfxMacroInfo& rOther) const -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 if ( GetQualifiedName() == rOther.GetQualifiedName() && //STRIP001 bAppBasic == rOther.bAppBasic ) //STRIP001 return sal_True; @@ -334,7 +334,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; //========================================================================== /*?*/ String SfxMacroInfo::GetMacroName() const -/*?*/ {DBG_ASSERT(0, "STRIP");return String(); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String(); //STRIP001 //STRIP001 String aMacroName = aMethodName; //STRIP001 aMacroName += '('; //STRIP001 aMacroName += aLibName; @@ -347,7 +347,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; //========================================================================== /*?*/ String SfxMacroInfo::GetQualifiedName() const -/*?*/ {DBG_ASSERT(0, "STRIP");return String(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String(); //STRIP001 String aMacroName; //STRIP001 if( aMacroName.Len() || aLibName.Len() ) //STRIP001 { @@ -364,7 +364,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ } /*?*/ String SfxMacroInfo::GetFullQualifiedName() const -/*?*/ {DBG_ASSERT(0, "STRIP");return String(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String(); //STRIP001 // Liefert nur Unsinn, wenn f"ur ein ::com::sun::star::script::JavaScript aufgerufen ! //STRIP001 String aRet; //STRIP001 if ( bAppBasic ) @@ -375,7 +375,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ } /*?*/ String SfxMacroInfo::GetURL() const -/*?*/ {DBG_ASSERT(0, "STRIP");return String(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String(); //STRIP001 if ( !aLibName.Len() ) //STRIP001 return aMethodName; //STRIP001 @@ -399,7 +399,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; //========================================================================== /*?*/ BasicManager* SfxMacroInfo::GetBasicManager() const -/*?*/ {DBG_ASSERT(0, "STRIP");return NULL; //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return NULL; //STRIP001 //STRIP001 if (bAppBasic) //STRIP001 { //STRIP001 return SFX_APP()->GetBasicManager(); @@ -415,7 +415,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; //========================================================================== /*?*/ String SfxMacroInfo::GetBasicName() const -/*?*/ {DBG_ASSERT(0, "STRIP");return String();//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String();//STRIP001 //STRIP001 if (bAppBasic) //STRIP001 { //STRIP001 return SFX_APP()->GetName(); @@ -431,14 +431,14 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ } /*?*/ String SfxMacroInfo::GetHelpText() const -/*?*/ {DBG_ASSERT(0, "STRIP");return String(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String(); //STRIP001 if ( pHelpText ) //STRIP001 return *pHelpText; //STRIP001 return String(); /*?*/ } /*?*/ String SfxMacroConfig::RequestHelp( sal_uInt16 nId ) -/*?*/ {DBG_ASSERT(0, "STRIP");return String(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return String(); //STRIP001 SfxMacroInfo *pInfo = SFX_APP()->GetMacroConfig()->GetMacroInfo( nId ); //STRIP001 if ( !pInfo ) //STRIP001 return String(); @@ -456,7 +456,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ } /*?*/ void SfxMacroInfo::SetHelpText( const String& rName ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !pHelpText ) //STRIP001 pHelpText = new String; //STRIP001 *pHelpText = rName; @@ -553,7 +553,7 @@ SfxMacroConfig* SfxMacroConfig::pMacroConfig = NULL; /*?*/ SfxMacroConfig::SfxMacroConfig() /*?*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; /*?*/ } //========================================================================== @@ -571,7 +571,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; /*?*/ SFX_EXEC_STUB( SfxApplication, MacroExec_Impl ) /*?*/ sal_uInt16 SfxMacroConfig::GetSlotId(SfxMacroInfoPtr pInfo) -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 sal_uInt16 nCount = pImp->aArr.Count(); // Macro suchen //STRIP001 sal_uInt16 i; //STRIP001 for (i=0; i<nCount; i++) @@ -635,7 +635,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; //========================================================================== /*?*/ void SfxMacroConfig::ReleaseSlotId(sal_uInt16 nId) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( IsMacroSlot( nId ), "SlotId ist kein Macro!"); //STRIP001 //STRIP001 sal_uInt16 nCount = pImp->aArr.Count(); @@ -692,7 +692,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; //========================================================================== /*?*/ void SfxMacroConfig::RegisterSlotId(sal_uInt16 nId) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( IsMacroSlot( nId ), "SlotId ist kein Macro!"); //STRIP001 //STRIP001 sal_uInt16 nCount = pImp->aArr.Count(); @@ -711,7 +711,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; //========================================================================== /*?*/ const SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo(sal_uInt16 nId) const -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 sal_uInt16 nCount = pImp->aArr.Count(); //STRIP001 for (sal_uInt16 i=0; i<nCount; i++) //STRIP001 if ((pImp->aArr)[i]->nSlotId == nId) @@ -723,7 +723,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; //========================================================================== /*?*/ const SfxMacroInfoPtr SfxMacroConfig::GetMacroInfo_Impl( const SvxMacro *pMacro ) const -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 sal_uInt16 nCount = pImp->aArr.Count(); //STRIP001 for (sal_uInt16 i=0; i<nCount; i++) //STRIP001 if ((pImp->aArr)[i]->Compare(*pMacro) ) @@ -734,7 +734,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; //========================================================================== /*?*/ sal_Bool SfxMacroConfig::ExecuteMacro( sal_uInt16 nId, const String& rArgs ) const -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 const SfxMacroInfoPtr pInfo = GetMacroInfo( nId ); //STRIP001 if ( !pInfo ) //STRIP001 return sal_False; @@ -750,7 +750,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; /*?*/ } /*?*/ sal_Bool SfxMacroConfig::ExecuteMacro( SfxObjectShell *pSh, const SvxMacro* pMacro, const String& rArgs ) const -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 SfxApplication *pApp = SFX_APP(); //STRIP001 //STRIP001 // Name des Macros oder Scripts bzw. ScriptCode @@ -828,7 +828,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; /*?*/ } /*?*/ sal_Bool SfxMacroConfig::CheckMacro( SfxObjectShell *pSh, const SvxMacro* pMacro ) const -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 SfxApplication *pApp = SFX_APP(); //STRIP001 //STRIP001 // Name des Macros oder Scripts bzw. ScriptCode @@ -856,7 +856,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; //========================================================================== /*?*/ sal_Bool SfxMacroConfig::CheckMacro( sal_uInt16 nId ) const -/*?*/ {DBG_ASSERT(0, "STRIP");return FALSE; //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE; //STRIP001 //STRIP001 const SfxMacroInfoPtr pInfo = GetMacroInfo( nId ); //STRIP001 if ( !pInfo ) //STRIP001 return sal_False; @@ -887,19 +887,19 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; /*?*/ IMPL_LINK( SfxMacroConfig, CallbackHdl_Impl, SfxMacroConfig*, pConfig ) /*?*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 pImp->bWaitingForCallback = sal_False; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pImp->bWaitingForCallback = sal_False; /*?*/ return 0; /*?*/ } /*?*/ IMPL_LINK( SfxMacroConfig, EventHdl_Impl, SfxMacroInfo*, pInfo ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ delete pInfo; /*?*/ pImp->nEventId = 0; /*?*/ return 0; /*?*/ } /*?*/ sal_Bool SfxMacroConfig::IsBasic( SbxObject* pVCtrl, const String& rCode, BasicManager* pMgr ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 /*?*/ sal_Bool bFound; //STRIP001 /*?*/ SFX_APP()->EnterBasicCall(); //STRIP001 /*?*/ bFound = SfxQueryMacro( pMgr, rCode ) != 0; @@ -909,7 +909,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp = new SfxMacroConfig_Impl; /*?*/ ErrCode SfxMacroConfig::Call( SbxObject* pVCtrl, /*?*/ const String& rCode, BasicManager* pMgr, SbxArray *pArgs, SbxValue *pRet ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 SfxApplication *pApp = SFX_APP(); //STRIP001 pApp->EnterBasicCall(); //STRIP001 SbMethod* pMethod = SfxQueryMacro( pMgr, rCode ); diff --git a/binfilter/bf_sfx2/source/control/sfx2_request.cxx b/binfilter/bf_sfx2/source/control/sfx2_request.cxx index 90e6d1cc8..3bb240745 100644 --- a/binfilter/bf_sfx2/source/control/sfx2_request.cxx +++ b/binfilter/bf_sfx2/source/control/sfx2_request.cxx @@ -2,7 +2,7 @@ // class SfxRequest // // (C) 1996 - 2000 StarDivision GmbH, Hamburg, Germany -// $Author: mwu $ $Date: 2003-11-06 07:38:44 $ $Revision: 1.2 $ +// $Author: rt $ $Date: 2004-05-05 16:40:11 $ $Revision: 1.3 $ // $Logfile: T:/bf_sfx2/source/control/request.cxv $ $Workfile: REQUEST.CXX $ //------------------------------------------------------------------*/ @@ -210,7 +210,7 @@ namespace binfilter { /*?*/ pImp->bUseTarget = FALSE; /*?*/ pImp->pViewFrame = pViewFrame; /*?*/ if( pImp->pViewFrame->GetDispatcher()->GetShellAndSlot_Impl( nSlotId, &pImp->pShell, &pImp->pSlot, TRUE, TRUE ) ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pImp->SetPool( &pImp->pShell->GetPool() ); //STRIP001 /*?*/ pImp->xRecorder = SfxRequest::GetMacroRecorder( pViewFrame ); //STRIP001 /*?*/ pImp->aTarget = pImp->pShell->GetName(); @@ -331,7 +331,7 @@ namespace binfilter { geht in das Eigentum des Aufrufers "uber. */ -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 String aCommand = String::CreateFromAscii(".uno:"); //STRIP001 aCommand.AppendAscii( pSlot->GetUnoName() ); //STRIP001 ::rtl::OUString aCmd( aCommand ); @@ -398,7 +398,7 @@ namespace binfilter { dann also noch leben. */ -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_MEMTEST(); //STRIP001 pImp->pShell = &rSh; //STRIP001 pImp->pSlot = &rSlot; @@ -410,7 +410,7 @@ namespace binfilter { //-------------------------------------------------------------------- /*?*/ void SfxRequest::SetArgs( const SfxAllItemSet& rArgs ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 delete pArgs; //STRIP001 pArgs = new SfxAllItemSet(rArgs); //STRIP001 pImp->SetPool( pArgs->GetPool() ); @@ -428,7 +428,7 @@ namespace binfilter { //-------------------------------------------------------------------- /*?*/ void SfxRequest::RemoveItem( USHORT nID ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (pArgs) //STRIP001 { //STRIP001 pArgs->ClearItem(nID); @@ -577,7 +577,7 @@ namespace binfilter { f"uhrte (z.B. Datei konnte nicht ge"offnet werden). */ -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 Done_Impl( &rSet ); //STRIP001 //STRIP001 // ggf. Items merken, damit StarDraw sie abfragen kann @@ -630,7 +630,7 @@ namespace binfilter { wenn das Ziel (genauer dessen Pool) stirbt. */ -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 pImp->bCancelled = TRUE; //STRIP001 pImp->SetPool( 0 ); //STRIP001 DELETEZ( pArgs ); @@ -916,7 +916,7 @@ namespace binfilter { Documents.Open( ... ) */ -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 pImp->aTarget = rTarget; //STRIP001 pImp->bUseTarget = TRUE; /*N*/ } diff --git a/binfilter/bf_sfx2/source/control/sfx2_shell.cxx b/binfilter/bf_sfx2/source/control/sfx2_shell.cxx index f2b6c4d5b..8a03fe5c4 100644 --- a/binfilter/bf_sfx2/source/control/sfx2_shell.cxx +++ b/binfilter/bf_sfx2/source/control/sfx2_shell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_shell.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:18 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,7 +151,7 @@ namespace binfilter { String zur"uck. Z.B.: SfxApplication[StarWriter] */ -/*?*/ {DBG_ASSERT(0, "STRIP"); return String();//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return String();//STRIP001 //STRIP001 String aIdent( pSh->ISA(SfxApplication) ? DEFINE_CONST_UNICODE("SfxApplication") : //STRIP001 pSh->ISA(SfxViewFrame) ? DEFINE_CONST_UNICODE("SfxViewFrame") : //STRIP001 pSh->ISA(SfxViewShell) ? DEFINE_CONST_UNICODE("SfxViewShell") : @@ -1128,7 +1128,7 @@ ULONG SfxShell::ExecuteSlot /*?*/ long ShellCall_Impl( void* pObj, void* pArg ) /*?*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 ((SfxShell* )pObj)->ExecuteSlot( *(SfxRequest*)pArg, (SfxInterface*)0L ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SfxShell* )pObj)->ExecuteSlot( *(SfxRequest*)pArg, (SfxInterface*)0L ); /*?*/ return 0; /*N*/ } @@ -1138,7 +1138,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SfxShell* )pObj)->ExecuteSlot( *(SfxReques //-------------------------------------------------------------------- /*?*/ const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, BOOL bAsync ) -/*?*/ {DBG_ASSERT(0, "STRIP");return 0; //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");return 0; //STRIP001 //STRIP001 if( !bAsync ) //STRIP001 return ExecuteSlot( rReq, (SfxInterface*)0L ); //STRIP001 else @@ -1368,7 +1368,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SfxShell* )pObj)->ExecuteSlot( *(SfxReques /*?*/ pImp->pVerbs = new SfxVerbList(); /*N*/ /*N*/ if (pVerbs) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ USHORT nr=0; //STRIP001 /*?*/ for (USHORT n=0; n<pVerbs->Count(); n++) //STRIP001 /*?*/ { @@ -1423,13 +1423,13 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SfxShell* )pObj)->ExecuteSlot( *(SfxReques /*?*/ const SvVerbList* SfxShell::GetVerbs() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return pImp->pVerbs ? &pImp->pVerbs->aVerbList : 0; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return pImp->pVerbs ? &pImp->pVerbs->aVerbList : 0; /*?*/ } //-------------------------------------------------------------------- /*N*/ void SfxShell::VerbExec(SfxRequest& rReq) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 USHORT nId = rReq.GetSlot(); //STRIP001 SfxViewShell *pViewShell = GetViewShell(); //STRIP001 if ( pViewShell ) @@ -1457,7 +1457,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SfxShell* )pObj)->ExecuteSlot( *(SfxReques //-------------------------------------------------------------------- /*?*/ const SfxSlot* SfxShell::GetVerbSlot_Impl(USHORT nId) const -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // DBG_ASSERT(pImp->pVerbs, "Keine Verben bekannt!"); //STRIP001 if (!pImp->pVerbs) //STRIP001 return 0; @@ -1491,7 +1491,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SfxShell* )pObj)->ExecuteSlot( *(SfxReques //-------------------------------------------------------------------- /*?*/ SfxObjectShell* SfxShell::GetObjectShell() -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if ( GetViewShell() ) //STRIP001 /*?*/ return GetViewShell()->GetViewFrame()->GetObjectShell(); //STRIP001 /*?*/ else diff --git a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx index 2065edf4c..a23e065ea 100644 --- a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx +++ b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_srchitem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:38:46 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -316,7 +316,7 @@ using namespace ::com::sun::star::uno; /*N*/ } /*N*/ void SvxSearchItem::GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& rDescr ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetSearchString( rDescr->getSearchString() ); //STRIP001 ::com::sun::star::uno::Any aAny = rDescr->getPropertyValue( DEFINE_CONST_UNICODE("SearchWords") ); //STRIP001 sal_Bool bTemp ; @@ -353,7 +353,7 @@ using namespace ::com::sun::star::uno; /*N*/ } /*N*/ void SvxSearchItem::SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 rDescr->setSearchString( GetSearchString() ); //STRIP001 ::com::sun::star::uno::Any aAny; //STRIP001 aAny <<= GetWordOnly() ; @@ -380,7 +380,7 @@ using namespace ::com::sun::star::uno; /*N*/ void SvxSearchItem::Notify( const Sequence< OUString > &rPropertyNames ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // applies transliteration changes in the configuration database //STRIP001 // to the current SvxSearchItem //STRIP001 SetTransliterationFlags( SvtSearchOptions().GetTransliterationFlags() ); @@ -388,7 +388,7 @@ using namespace ::com::sun::star::uno; /*N*/ void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bVal) //STRIP001 aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_WIDTH; //STRIP001 else @@ -397,7 +397,7 @@ using namespace ::com::sun::star::uno; /*N*/ void SvxSearchItem::SetWordOnly( sal_Bool bVal ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bVal) //STRIP001 aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY; //STRIP001 else @@ -406,7 +406,7 @@ using namespace ::com::sun::star::uno; /*N*/ void SvxSearchItem::SetExact( sal_Bool bVal ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (!bVal) //STRIP001 aSearchOpt.transliterateFlags |= TransliterationModules_IGNORE_CASE; //STRIP001 else @@ -415,7 +415,7 @@ using namespace ::com::sun::star::uno; /*N*/ void SvxSearchItem::SetSelection( sal_Bool bVal ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bVal) //STRIP001 { //STRIP001 aSearchOpt.searchFlag |= (SearchFlags::REG_NOT_BEGINOFLINE | @@ -430,7 +430,7 @@ using namespace ::com::sun::star::uno; /*N*/ void SvxSearchItem::SetRegExp( sal_Bool bVal ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bVal) //STRIP001 aSearchOpt.algorithmType = SearchAlgorithms_REGEXP; //STRIP001 else @@ -439,7 +439,7 @@ using namespace ::com::sun::star::uno; /*N*/ void SvxSearchItem::SetLEVRelaxed( sal_Bool bVal ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bVal) //STRIP001 aSearchOpt.searchFlag |= SearchFlags::LEV_RELAXED; //STRIP001 else @@ -448,7 +448,7 @@ using namespace ::com::sun::star::uno; /*N*/ void SvxSearchItem::SetLevenshtein( sal_Bool bVal ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bVal) //STRIP001 aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE; //STRIP001 else @@ -458,11 +458,11 @@ using namespace ::com::sun::star::uno; /*N*/ void SvxSearchItem::SetTransliterationFlags( sal_Int32 nFlags ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 aSearchOpt.transliterateFlags = nFlags; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aSearchOpt.transliterateFlags = nFlags; /*N*/ } /*N*/ sal_Bool SvxSearchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return sal_True;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_True;//STRIP001 //STRIP001 sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); //STRIP001 nMemberId &= ~CONVERT_TWIPS; //STRIP001 switch ( nMemberId ) @@ -522,7 +522,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 aSearchOpt.transliterateFlags = nFlags; // ----------------------------------------------------------------------- /*N*/ sal_Bool SvxSearchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return sal_True;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_True;//STRIP001 //STRIP001 sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); //STRIP001 nMemberId &= ~CONVERT_TWIPS; //STRIP001 sal_Bool bRet = sal_False; diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx index b309c079e..dcf0e4f90 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_docfac.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:32 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -197,7 +197,7 @@ DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 ) //STRIP008; /*?*/ const String& rMimeType, /*?*/ const String& rUserData // zum Wiedererkennen oder (frei verwendbar) /*?*/ ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS(SfxObjectFactory, 0); //STRIP001 sal_uInt16 nDemo = SFX_APP()->GetDemoKind(); //STRIP001 @@ -533,7 +533,7 @@ DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 ) //STRIP008; //STRIP001 } /*?*/ void SfxObjectFactory::SetStandardTemplate( const String& rFactoryURL, const String& rTemplate ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SfxObjectFactory* pFactory = SfxObjectFactory::GetFactory( rFactoryURL ); //STRIP001 if ( pFactory ) //STRIP001 { @@ -560,7 +560,7 @@ DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 ) //STRIP008; /*N*/ } /*?*/ const SfxObjectFactory* SfxObjectFactory::GetFactory( const String& rFactoryURL ) -/*?*/ { // #dochnoetig# DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ { // #dochnoetig# DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 /*N*/ const SfxObjectFactory* pFactory = 0; /*N*/ String aFact( rFactoryURL ); /*N*/ String aPrefix( DEFINE_CONST_UNICODE( "private:factory/" ) ); @@ -589,7 +589,7 @@ DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 ) //STRIP008; /*?*/ } /*?*/ const SfxFilter* SfxObjectFactory::GetTemplateFilter() const -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 USHORT nFilterCount = pImpl->pFilterContainer->GetFilterCount(); //STRIP001 USHORT nVersion = 0; //STRIP001 const SfxFilter *pFilter = NULL; @@ -679,7 +679,7 @@ DECL_PTRARRAY( SfxViewFactoryArr_Impl, SfxViewFactory*, 2, 2 ) //STRIP008; /*N*/ } /*?*/ String SfxObjectFactory::GetModuleName() const -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SvtModuleOptions::EFactory eFac = SvtModuleOptions::E_WRITER; //STRIP001 if ( SvtModuleOptions::ClassifyFactoryByName( GetDocumentServiceName(), eFac ) ) //STRIP001 return SvtModuleOptions().GetModuleName( eFac ); diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx index 98084005b..637868237 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_docfile.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:39:15 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -313,7 +313,7 @@ namespace binfilter { /*N*/ void SAL_CALL SfxMediumHandler_Impl::handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest ) /*N*/ throw( ::com::sun::star::uno::RuntimeException ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( !m_xInter.is() ) //STRIP001 return; //STRIP001 @@ -463,7 +463,7 @@ namespace binfilter { /*N*/ } /*N*/ void SfxMedium::DataAvailable_Impl() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 pImp->aAvailableLink.ClearPendingCall(); //STRIP001 pImp->aAvailableLink.Call( NULL ); /*N*/ } @@ -870,7 +870,7 @@ namespace binfilter { //------------------------------------------------------------------ /*N*/ sal_Bool SfxMedium::TryStorage() -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 GetStorage(); //STRIP001 //STRIP001 if ( aStorage.Is() ) @@ -1404,7 +1404,7 @@ namespace binfilter { /*N*/ /*N*/ return; /*N*/ } -/*N*/ DBG_ASSERT(0, "STRIP"); return;//STRIP001 +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return;//STRIP001 //STRIP001 /*?*/ GetContent(); //STRIP001 /*?*/ if ( !pImp->aContent.get().is() ) //STRIP001 /*?*/ { @@ -1603,7 +1603,7 @@ namespace binfilter { //------------------------------------------------------------------ /*?*/ void SfxMedium::DoInternalBackup_Impl( const ::ucb::Content& aOriginalContent ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 if ( pImp->m_aBackupURL.getLength() ) //STRIP001 return; // the backup was done already //STRIP001 @@ -2225,7 +2225,7 @@ String SfxMedium::GetStatusString( const SvProgressArg* pArg ) //---------------------------------------------------------------- /*N*/ void SfxMedium::SetPhysicalName_Impl( const String& rNameP ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( rNameP != aName ) //STRIP001 { //STRIP001 if( pImp->pTempFile ) @@ -2625,7 +2625,7 @@ String SfxMedium::GetStatusString( const SvProgressArg* pArg ) /*N*/ } /*N*/ SvEaMgr* SfxMedium::GetEaMgr() -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if ( !pImp->pEaMgr && pFilter ) //STRIP001 { //STRIP001 /* the stream in the storage is probably not a filestream ( the stream is diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx index c99f41c08..2915306a7 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_docfilt.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -233,7 +233,7 @@ namespace binfilter { /*N*/ } /*?*/ const ::com::sun::star::plugin::PluginDescription* SfxFilter::GetPlugData() -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if( !bPlugDataSearched ) //STRIP001 { //STRIP001 bPlugDataSearched = sal_True; @@ -271,7 +271,7 @@ namespace binfilter { /*?*/ } /*?*/ sal_Bool SfxFilter::IsFirstPlugin() const -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const ::com::sun::star::plugin::PluginDescription* pData = GetPlugData(); //STRIP001 if( pData ) //STRIP001 { diff --git a/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx b/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx index 332326f0b..2d1d44230 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_frameobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_frameobj.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:39:18 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -301,7 +301,7 @@ namespace binfilter { nach einem. Dies muss asynchron geschehen, da in den H„ndlern des IP-Protocol eine modale Dialogbox verboten ist. */ -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ sfx2::FileDialogHelper aDlg( WB_OPEN ); //STRIP001 /*?*/ //STRIP001 /*?*/ if( ERRCODE_NONE == aDlg.Execute() ) @@ -324,7 +324,7 @@ namespace binfilter { Die Methode erzeugt den Frame. Es ist notwendig, da\s das Objekt InPlace-Active ist. */ -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // Nur in SfxApps kann ein Frame aufgebaut werden //STRIP001 SfxInPlaceClientRef aClient = GetIPClient(); //STRIP001 if ( !aClient.Is() ) @@ -731,7 +731,7 @@ namespace binfilter { <SvPersist::Load> */ -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( SvInPlaceObject::Load( pStor ) ) //STRIP001 { //STRIP001 SvStorageStreamRef xStm; @@ -772,7 +772,7 @@ namespace binfilter { <SvPersist::Save> */ -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( SvInPlaceObject::Save() ) //STRIP001 { //STRIP001 SvStorageStreamRef xStm; @@ -812,7 +812,7 @@ namespace binfilter { <SvPersist::SaveAs> */ -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( SvInPlaceObject::SaveAs( pStor ) ) //STRIP001 { //STRIP001 SvStorageStreamRef xStm; @@ -916,7 +916,7 @@ namespace binfilter { //STRIP001 } /*?*/ void SfxFrameObject::SetFrameDescriptor( const SfxFrameDescriptor *pD ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( pD, "Kein Descriptor!" ); //STRIP001 if ( pD ) //STRIP001 { @@ -936,7 +936,7 @@ namespace binfilter { /*?*/ } /*?*/ const SfxFrameDescriptor* SfxFrameObject::GetFrameDescriptor() const -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 /*?*/ return pImpl->pFrmDescr; /*?*/ } diff --git a/binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx b/binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx index a634cde4f..74eef3a1c 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_frmdescr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_frmdescr.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,7 +109,7 @@ namespace binfilter { /*N*/ bRowSet( FALSE ), /*N*/ nMaxId( 0 ), /*N*/ nHasBorder( BORDER_YES ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CTOR(SfxFrameSetDescriptor, 0); //STRIP001 //STRIP001 pImp = new SfxFrameSetDescriptor_Impl; @@ -196,7 +196,7 @@ namespace binfilter { //STRIP001 } //STRIP001 /*N*/ BOOL SfxFrameSetDescriptor::HasFrameBorder() const -/*N*/ {DBG_ASSERT(0, "STRIP");return FALSE; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE; //STRIP001 //STRIP001 if ( pImp->bNetscapeCompat && !GetFrameSpacing() ) //STRIP001 return FALSE; //STRIP001 @@ -416,7 +416,7 @@ namespace binfilter { /*N*/ /*N*/ pImp = new SfxFrameDescriptor_Impl; /*N*/ if ( pParentFrameSet ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pParentFrameSet->InsertFrame( this ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pParentFrameSet->InsertFrame( this ); /*N*/ } /*N*/ SfxFrameDescriptor::~SfxFrameDescriptor() @@ -426,7 +426,7 @@ namespace binfilter { /*N*/ if ( pFrameSet ) /*N*/ delete pFrameSet; /*N*/ if ( pParentFrameSet ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pParentFrameSet->RemoveFrame( this ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pParentFrameSet->RemoveFrame( this ); /*N*/ delete pImp; /*N*/ } @@ -438,7 +438,7 @@ namespace binfilter { /*N*/ } /*?*/ void SfxFrameDescriptor::SetURL( const String& rURL ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 aURL = rURL; //STRIP001 SetActualURL( aURL ); //STRIP001 } @@ -508,7 +508,7 @@ namespace binfilter { //STRIP001 } /*N*/ BOOL SfxFrameDescriptor::Store( SvStream& rStream ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 long lPos = rStream.Tell(); //STRIP001 long lLength = 0L; //STRIP001 rStream << lLength << VERSION; @@ -557,7 +557,7 @@ namespace binfilter { /*N*/ } /*N*/ BOOL SfxFrameDescriptor::Load( SvStream& rStream, USHORT nVersion ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 String aURLName; //STRIP001 USHORT nFlags1, nFlags2, nScroll, nSet, nSelector; //STRIP001 @@ -601,7 +601,7 @@ namespace binfilter { /*N*/ SfxFrameDescriptor* SfxFrameDescriptor::Clone( /*N*/ SfxFrameSetDescriptor *pSet, BOOL bWithIds ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 SfxFrameDescriptor *pFrame = //STRIP001 new SfxFrameDescriptor( pSet ); //STRIP001 @@ -887,7 +887,7 @@ namespace binfilter { //STRIP001 } /*N*/ BOOL SfxFrameDescriptor::HasFrameBorder() const -/*N*/ {DBG_ASSERT(0, "STRIP");return FALSE; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE; //STRIP001 //STRIP001 if ( pParentFrameSet ) //STRIP001 { //STRIP001 if ( pParentFrameSet->pImp->bNetscapeCompat && !pParentFrameSet->GetFrameSpacing() ) @@ -981,7 +981,7 @@ namespace binfilter { /*N*/ , bSetResizable( FALSE ) /*N*/ , bIsRootSet( FALSE ) /*N*/ , pFrame( pD->Clone() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SfxFrameSetDescriptor *pSet = pD->GetParent(); //STRIP001 if ( pSet ) //STRIP001 { diff --git a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx index 25bf67de8..f544dbbe7 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_interno.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mwu $ $Date: 2003-11-20 05:58:10 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -317,7 +317,7 @@ namespace binfilter { /*N*/ /*N*/ // bei InPlace die View skalieren /*N*/ if ( GetIPEnv() && GetIPEnv()->GetEditWin() && !bDisableViewScaling && pIPF ) -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 pIPF->GetEnv_Impl()->MakeScale( rRect.GetSize(), GetMapUnit(), +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 pIPF->GetEnv_Impl()->MakeScale( rRect.GetSize(), GetMapUnit(), //STRIP001 /*?*/ pIPF->GetViewShell()->GetWindow()->GetOutputSizePixel() ); /*N*/ } /*N*/ } @@ -390,7 +390,7 @@ namespace binfilter { //------------------------------------------------------------------------- /*N*/ void SfxInPlaceObject::InPlaceActivate( BOOL bActivate ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( bActivate ) //STRIP001 { //STRIP001 DBG_ASSERT( pObjShell, @@ -429,7 +429,7 @@ namespace binfilter { //-------------------------------------------------------------------- /*N*/ void SfxInPlaceObject::Embed( BOOL bEmbed ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /* //STRIP001 SvInPlaceObject::Embed( bEmbed ); //STRIP001 @@ -579,7 +579,7 @@ namespace binfilter { //-------------------------------------------------------------------- /*N*/ void SfxInPlaceObject::DocumentNameChanged( const String & rDocName ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !pFrame->IsA( TYPE(SfxInPlaceFrame) ) ) //STRIP001 { //STRIP001 // Name f"ur Window zusammenbauen diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx index e22216d92..910dd9d64 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_objcont.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:33 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -147,7 +147,7 @@ using namespace ::com::sun::star::uno; //==================================================================== /*?*/ GDIMetaFile* SfxObjectShell::GetPreviewMetaFile( sal_Bool bFullContent ) const -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 // Nur wenn gerade nicht gedruckt wird, darf DoDraw aufgerufen //STRIP001 // werden, sonst wird u.U. der Printer abgeschossen ! //STRIP001 SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this ); @@ -442,7 +442,7 @@ using namespace ::com::sun::star::uno; /*?*/ else /*?*/ { /*?*/ // create new view -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pFrame->CreateView_Impl( nViewId ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pFrame->CreateView_Impl( nViewId ); /*?*/ } /*?*/ } /*?*/ else @@ -465,7 +465,7 @@ using namespace ::com::sun::star::uno; /*?*/ } /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pFrame = SfxTopFrame::Create( this, nViewId, FALSE, pSet )->GetCurrentViewFrame(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pFrame = SfxTopFrame::Create( this, nViewId, FALSE, pSet )->GetCurrentViewFrame(); /*?*/ } /*?*/ /*?*/ // only temporary data, don't hold it in the itemset @@ -571,7 +571,7 @@ using namespace ::com::sun::star::uno; /*N*/ #endif /*N*/ if( nMaxSize && !GetDocInfo().IsPasswd() && /*N*/ SFX_CREATE_MODE_STANDARD == eCreateMode ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ GDIMetaFile* pFile = GetPreviewMetaFile(); //STRIP001 /*?*/ if ( pFile ) //STRIP001 /*?*/ { @@ -882,7 +882,7 @@ using namespace ::com::sun::star::uno; /*?*/ const String& rName /*?*/ ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 // Objekt erzeugen ist fehlgeschlagen? //STRIP001 if ( !pObj ) //STRIP001 HACK(Fehlermeldung fehlt) @@ -1002,7 +1002,7 @@ void SfxObjectShell::TransferConfig(SfxObjectShell& rObjSh) /*N*/ USHORT SfxObjectShell::GetContentCount(USHORT nIdx1, /*N*/ USHORT nIdx2) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 switch(nIdx1) //STRIP001 { //STRIP001 case INDEX_IGNORE: @@ -1078,7 +1078,7 @@ void SfxObjectShell::TransferConfig(SfxObjectShell& rObjSh) /*N*/ USHORT i, /*N*/ USHORT nIdx1, /*N*/ USHORT nIdx2 ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ERRORFILE( "Non high contrast method called. Please update calling code!" ); //STRIP001 SfxObjectShell::GetContent( rText, rClosedBitmap, rOpenedBitmap, BMP_COLOR_NORMAL, bCanDel, i, nIdx1, nIdx2 ); /*N*/ } @@ -1093,7 +1093,7 @@ void SfxObjectShell::TransferConfig(SfxObjectShell& rObjSh) /*N*/ USHORT i, /*N*/ USHORT nIdx1, /*N*/ USHORT nIdx2 ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 bCanDel=TRUE; //STRIP001 //STRIP001 switch(nIdx1) @@ -1596,7 +1596,7 @@ void SfxObjectShell::TransferConfig(SfxObjectShell& rObjSh) rufen. */ -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 struct Styles_Impl //STRIP001 { //STRIP001 SfxStyleSheetBase *pSource; @@ -1654,7 +1654,7 @@ void SfxObjectShell::TransferConfig(SfxObjectShell& rObjSh) StyleSheets updated. */ -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // Storage-medium? //STRIP001 SfxMedium *pFile = GetMedium(); //STRIP001 DBG_ASSERT( pFile, "cannot UpdateFromTemplate without medium" ); @@ -1825,7 +1825,7 @@ void SfxObjectShell::TransferConfig(SfxObjectShell& rObjSh) /*N*/ } /*N*/ SvStorageRef SfxObjectShell::GetConfigurationStorage( SotStorage* pStor ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return SvStorageRef();//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return SvStorageRef();//STRIP001 //STRIP001 // configuration storage shall be opened in own storage or a new storage, if the //STRIP001 // document is getting stored into this storage //STRIP001 if ( !pStor ) @@ -1843,7 +1843,7 @@ void SfxObjectShell::TransferConfig(SfxObjectShell& rObjSh) /*N*/ } /*N*/ SotStorageStreamRef SfxObjectShell::GetConfigurationStream( const String& rName, BOOL bCreate ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return SotStorageStreamRef();//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return SotStorageStreamRef();//STRIP001 //STRIP001 SotStorageStreamRef xStream; //STRIP001 SvStorageRef xStorage = GetConfigurationStorage(); //STRIP001 if ( xStorage.Is() ) @@ -1906,7 +1906,7 @@ void SfxObjectShell::TransferConfig(SfxObjectShell& rObjSh) /*N*/ } /*N*/ SfxObjectShellRef MakeObjectShellForOrganizer_Impl( const String& aTargetURL, BOOL bForWriting ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return SfxObjectShellRef();//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return SfxObjectShellRef();//STRIP001 //STRIP001 // check for own format //STRIP001 SfxObjectShellRef xDoc; //STRIP001 SfxMedium *pMed = new SfxMedium( aTargetURL, STREAM_STD_READ, FALSE, 0 ); diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx index be34d3c21..fbae97a11 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_objmisc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:39:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -325,7 +325,7 @@ namespace binfilter { //------------------------------------------------------------------------- /*N*/ void SfxObjectShell::SetTemplate(sal_Bool bIs) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 pImp->bIsTemplate=bIs; //STRIP001 SfxFilterMatcher aMatcher( GetFactory().GetFilterContainer() ); //STRIP001 SfxFilterMatcherIter aIter( &aMatcher, SFX_FILTER_TEMPLATEPATH ); @@ -472,7 +472,7 @@ namespace binfilter { //------------------------------------------------------------------------- /*N*/ void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !pImp->bRunningMacro != !bModal ) //STRIP001 { //STRIP001 pImp->bRunningMacro = bModal; @@ -894,7 +894,7 @@ namespace binfilter { /* Stampit #111050# allow writer to set this event id here hardly! Please replace ith by a better solution! */ /*?*/ void SfxObjectShell::Stamp_SetActivateEvent(sal_uInt16 nId ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 if ( GetFactory().GetFlags() & SFXOBJECTSHELL_HASOPENDOC ) //STRIP001 pImp->nEventId = nId; /*?*/ } @@ -969,7 +969,7 @@ namespace binfilter { /*?*/ /*?*/ // seine Childs gelockt? /*?*/ for ( sal_uInt16 n = GetChildFrameCount(); n--; ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 if ( !GetChildFrame(n)->IsAutoLoadLocked_Impl() ) +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 if ( !GetChildFrame(n)->IsAutoLoadLocked_Impl() ) /*?*/ return sal_False; /*?*/ /*?*/ // sonst ist AutoLoad erlaubt @@ -1427,14 +1427,14 @@ namespace binfilter {//STRIP009 /*?*/ { /*?*/ DateTime aDateTime; /*?*/ if( INetRFC822Message::ParseDateField( rKV.GetValue(), aDateTime ) ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aDateTime.ConvertToLocalTime(); //STRIP001 /*?*/ pDoc->GetMedium()->SetExpired_Impl( aDateTime ); /*?*/ } /*?*/ else /*?*/ { /*?*/ // DBG_ERROR( "Schlechtes ::com::sun::star::util::DateTime fuer Expired" ); -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDoc->GetMedium()->SetExpired_Impl( Date( 1, 1, 1970 ) ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDoc->GetMedium()->SetExpired_Impl( Date( 1, 1, 1970 ) ); /*?*/ } /*?*/ } /*?*/ else if( rKV.GetKey().CompareIgnoreCaseToAscii( "content-type" ) == COMPARE_EQUAL ) @@ -1447,7 +1447,7 @@ namespace binfilter {//STRIP009 /*?*/ { /*?*/ const INetContentTypeParameter * pCharset = aParameters.find("charset"); /*?*/ if (pCharset != 0) -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 pDoc->GetMedium()->SetCharset( pCharset->m_sValue ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 pDoc->GetMedium()->SetCharset( pCharset->m_sValue ); /*?*/ } /*?*/ } /*?*/ } @@ -1662,7 +1662,7 @@ namespace binfilter {//STRIP009 /*?*/ if ( bSecure && bWarn || !bSecure && bConfirm ) /*?*/ { /*?*/ if ( !nAutoConformation ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ QueryBox aBox( GetDialogParent(), SfxResId( DLG_MACROQUERY ) ); //STRIP001 /*?*/ aBox.SetButtonText( aBox.GetButtonId(0), String( SfxResId(BTN_OK) ) ); //STRIP001 /*?*/ aBox.SetButtonText( aBox.GetButtonId(1), String( SfxResId(BTN_CANCEL) ) ); diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx index 3b59b025c..964180570 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_objserv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_objserv.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:48 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -239,7 +239,7 @@ svtools::AsynchronLink* pPendingCloser = 0; //========================================================================= /*N*/ void SfxObjectShell::PrintExec_Impl(SfxRequest &rReq) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SfxViewFrame *pFrame = SfxViewFrame::GetFirst(this); //STRIP001 if ( pFrame ) //STRIP001 { @@ -251,7 +251,7 @@ svtools::AsynchronLink* pPendingCloser = 0; //-------------------------------------------------------------------- /*N*/ void SfxObjectShell::PrintState_Impl(SfxItemSet &rSet) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 FASTBOOL bPrinting = FALSE; //STRIP001 SfxViewFrame *pFrame = SfxViewFrame::GetFirst(this, TYPE(SfxTopViewFrame)); //STRIP001 if ( pFrame ) @@ -863,7 +863,7 @@ svtools::AsynchronLink* pPendingCloser = 0; //-------------------------------------------------------------------- /*N*/ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 {DBG_CHKTHIS(SfxObjectShell, 0);} //STRIP001 //STRIP001 pImp->bSetStandardName=FALSE; @@ -1737,7 +1737,7 @@ svtools::AsynchronLink* pPendingCloser = 0; //-------------------------------------------------------------------- /*N*/ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 switch ( rReq.GetSlot() ) //STRIP001 { //STRIP001 case SID_MODIFIED: @@ -1801,7 +1801,7 @@ svtools::AsynchronLink* pPendingCloser = 0; //-------------------------------------------------------------------- /*N*/ void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SfxWhichIter aIter(rSet); //STRIP001 for ( USHORT nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() ) //STRIP001 { @@ -1894,7 +1894,7 @@ svtools::AsynchronLink* pPendingCloser = 0; //-------------------------------------------------------------------- /*N*/ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 switch ( rReq.GetSlot() ) //STRIP001 { //STRIP001 case SID_ACTIVATE: diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx index f2675e848..b3d2caccb 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_objstor.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:48 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -422,7 +422,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() /*?*/ sal_Bool SfxObjectShell::DoLoad( /*?*/ const String& rFileName, StreamMode nStreamMode, StorageMode nStorageMode) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // Es wird nur die IPersistStorage-Schnittstelle angeboten //STRIP001 /*?*/ ModifyBlocker_Impl aBlock( this ); //STRIP001 /*?*/ SvStorageRef xStor = new SvStorage( rFileName, nStreamMode | STREAM_WRITE, nStorageMode ); @@ -1033,7 +1033,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() /*N*/ SfxRequest::GetItem( pSet, SID_DOCINFO_COMMENTS, sal_False, TYPE(SfxStringItem) ) : NULL; /*N*/ /*N*/ if ( pVersionItem ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // store a version also //STRIP001 /*?*/ const SfxStringItem *pAuthorItem = pSet ? (const SfxStringItem*) //STRIP001 /*?*/ SfxRequest::GetItem( pSet, SID_DOCINFO_AUTHOR, sal_False, TYPE(SfxStringItem) ) : NULL; @@ -1124,7 +1124,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() //STRIP001 /*?*/ xVersion->Commit(); /*N*/ } /*N*/ else if ( pImp->bIsSaving ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // it's a "Save", not a "SaveAs" //STRIP001 /*?*/ // so all preliminary saved versions must be copied from the object storage to the the target storage //STRIP001 /*?*/ sal_Bool bUseXML = SOFFICE_FILEFORMAT_60 <= pFilter->GetVersion(); @@ -1227,7 +1227,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() /*N*/ // before we overwrite the original file, we will make a backup if there is a demand for that /*N*/ const sal_Bool bDoBackup = SvtSaveOptions().IsBackup(); /*N*/ if ( bDoBackup ) -/*N*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*N*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 /*N*/ pMedium->DoBackup_Impl(); //STRIP001 /*N*/ bOk = ( pMedium->GetError() == ERRCODE_NONE ); //STRIP001 /*N*/ if ( !bOk ) @@ -1264,7 +1264,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() /*?*/ OUString aOrigName = pMedium ? OUString(pMedium->GetName()) : OUString(); /*?*/ if ( aOrigName.getLength() && aOrigName.compareToAscii( "private:", 8 ) != COMPARE_EQUAL /*?*/ && !::utl::UCBContentHelper::Exists( aOrigName ) ) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 /*?*/ if ( !IsHandsOff() ) //STRIP001 /*?*/ DoHandsOff(); //STRIP001 /*?*/ @@ -1562,7 +1562,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() /*?*/ } /*?*/ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ::rtl::OUString aTypeName( rMedium.GetFilter()->GetTypeName() ); //STRIP001 /*?*/ ::rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); //STRIP001 /*?*/ @@ -1633,7 +1633,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() /*?*/ } /*?*/ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) -/*?*/ { // #dochnoetig# DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ { // #dochnoetig# DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ ::rtl::OUString aTypeName( rMedium.GetFilter()->GetTypeName() ); /*N*/ ::rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); /*N*/ ::com::sun::star::uno::Reference< ::com::sun::star::document::XExporter > xExporter; @@ -1770,7 +1770,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() //------------------------------------------------------------------------- /*?*/ void SfxObjectShell::SetEAs_Impl( SfxMedium &rMedium ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 //!! wenn OV eine entsprechende Funktionalitaet zur Verfuegung stellt, //STRIP001 // besser auf der geoeffneten Datei arbeiten //STRIP001 /*?*/ SvEaMgr *pMgr = rMedium.GetEaMgr(); @@ -1795,7 +1795,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() //------------------------------------------------------------------------- /*?*/ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return sal_False; //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False; //STRIP001 //STRIP001 /*?*/ SfxMedium *pMedium = GetMedium(); //STRIP001 /*?*/ const SfxFilter* pFilter = pMedium->GetFilter(); //STRIP001 /*?*/ @@ -1884,7 +1884,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() //------------------------------------------------------------------------- /*?*/ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return sal_False;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False;//STRIP001 //STRIP001 /*?*/ DBG_CHKTHIS(SfxObjectShell, 0); //STRIP001 /*?*/ SfxApplication *pSfxApp = SFX_APP(); //STRIP001 /*?*/ @@ -2124,7 +2124,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose() /*N*/ } /*N*/ /*N*/ if ( GetMedium()->GetFilter() && ( GetMedium()->GetFilter()->GetFilterFlags() & SFX_FILTER_PACKED ) ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SfxMedium *pMed = bCopyTo ? pMedium : pNewFile; //STRIP001 /*?*/ pNewFile->SetError( GetMedium()->Unpack_Impl( pMed->GetPhysicalName() ) ); /*N*/ } diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx index 30ae88856..9f54e2a1e 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_objxtor.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:33 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -524,7 +524,7 @@ static SfxObjectShell* pWorkingDoc = NULL; /*?*/ if ( pFrame ) /*?*/ { /*?*/ // minimierte restoren -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxFrame* pTop = pFrame->GetTopFrame(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxFrame* pTop = pFrame->GetTopFrame(); //STRIP001 /*?*/ pSfxApp->SetViewFrame( pTop->GetCurrentViewFrame() ); //STRIP001 /*?*/ pFrame->GetFrame()->Appear(); //STRIP001 /*?*/ @@ -604,7 +604,7 @@ static SfxObjectShell* pWorkingDoc = NULL; /*N*/ if ( bUI && !bClose && IsInformationLost() ) /*N*/ { /*N*/ // minimierte restoren -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxFrame* pTop = pFrame->GetTopFrame(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxFrame* pTop = pFrame->GetTopFrame(); //STRIP001 /*?*/ pSfxApp->SetViewFrame( pTop->GetCurrentViewFrame() ); //STRIP001 /*?*/ pFrame->GetFrame()->Appear(); //STRIP001 /*?*/ QueryBox aBox( &pFrame->GetWindow(), SfxResId(MSG_CONFIRM_FILTER)); @@ -647,7 +647,7 @@ static SfxObjectShell* pWorkingDoc = NULL; //-------------------------------------------------------------------- /*?*/ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer() -/*?*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if( !pImp->pBasicLibContainer ) //STRIP001 GetBasicManager(); //STRIP001 Reference< XLibraryContainer > xRet diff --git a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx index 3706f3d77..214576867 100644 --- a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx +++ b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_sfxbasemodel.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:49 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -894,7 +894,7 @@ extern sal_Bool supportsMetaFileHandle_Impl(); /*?*/ { /*?*/ sal_Bool bEmb; /*?*/ if ( ( rArgs[0].Value >>= bEmb ) && bEmb ) -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 m_pData->m_pObjectShell->SetCreateMode_Impl( SFX_CREATE_MODE_EMBEDDED ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 m_pData->m_pObjectShell->SetCreateMode_Impl( SFX_CREATE_MODE_EMBEDDED ); /*?*/ } /*N*/ /*N*/ return sal_True; @@ -1275,7 +1275,7 @@ extern sal_Bool supportsMetaFileHandle_Impl(); /*N*/ { /*N*/ try /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP");//STRIP001 ((util::XCloseListener*)pCloseIterator.next())->notifyClosing( aSource ); +/*?*/ DBG_BF_ASSERT(0, "STRIP");//STRIP001 ((util::XCloseListener*)pCloseIterator.next())->notifyClosing( aSource ); /*?*/ } /*?*/ catch( uno::RuntimeException& ) /*?*/ { @@ -1607,7 +1607,7 @@ extern sal_Bool supportsMetaFileHandle_Impl(); //________________________________________________________________________________________________________ /*?*/ void SAL_CALL SfxBaseModel::print(const SEQUENCE< PROPERTYVALUE >& rOptions) /*?*/ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // object already disposed? //STRIP001 /*?*/ // object already disposed? //STRIP001 /*?*/ ::vos::OGuard aGuard( Application::GetSolarMutex() ); @@ -2023,7 +2023,7 @@ extern sal_Bool supportsMetaFileHandle_Impl(); /*?*/ throw (::com::sun::star::datatransfer::UnsupportedFlavorException, /*?*/ ::com::sun::star::io::IOException, /*?*/ ::com::sun::star::uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); ANY aAny; return aAny;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); ANY aAny; return aAny;//STRIP001 //STRIP001 // object already disposed? //STRIP001 ::vos::OGuard aGuard( Application::GetSolarMutex() ); //STRIP001 if ( impl_isDisposed() ) @@ -2135,7 +2135,7 @@ extern sal_Bool supportsMetaFileHandle_Impl(); /*?*/ SEQUENCE< DATAFLAVOR > SAL_CALL SfxBaseModel::getTransferDataFlavors() /*?*/ throw (::com::sun::star::uno::RuntimeException) -/*?*/ {DBG_ASSERT(0, "STRIP"); SEQUENCE< DATAFLAVOR > aDATAFLAVOR(0); return aDATAFLAVOR;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); SEQUENCE< DATAFLAVOR > aDATAFLAVOR(0); return aDATAFLAVOR;//STRIP001 //STRIP001 // object already disposed? //STRIP001 ::vos::OGuard aGuard( Application::GetSolarMutex() ); //STRIP001 if ( impl_isDisposed() ) @@ -2338,7 +2338,7 @@ extern sal_Bool supportsMetaFileHandle_Impl(); /*?*/ if ( pPrintHint->GetWhich() == -1 ) /*?*/ { /*?*/ if ( !m_pData->m_xPrintJob.is() ) -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 m_pData->m_xPrintJob = new SfxPrintJob_Impl( m_pData ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 m_pData->m_xPrintJob = new SfxPrintJob_Impl( m_pData ); /*?*/ /*?*/ PrintDialog* pDlg = pPrintHint->GetPrintDialog(); /*?*/ Printer* pPrinter = pPrintHint->GetPrinter(); @@ -2386,7 +2386,7 @@ extern sal_Bool supportsMetaFileHandle_Impl(); /*?*/ m_pData->m_aPrintOptions[ nOld+n ] = pPrintHint->GetAdditionalOptions()[n]; /*?*/ } /*?*/ else if ( pPrintHint->GetWhich() != -2 ) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 /*?*/ view::PrintJobEvent aEvent; //STRIP001 /*?*/ aEvent.Source = m_pData->m_xPrintJob; //STRIP001 /*?*/ aEvent.State = (::com::sun::star::view::PrintableState) pPrintHint->GetWhich(); diff --git a/binfilter/bf_sfx2/source/inc/scriptcont.hxx b/binfilter/bf_sfx2/source/inc/scriptcont.hxx index 91a59fcef..bcda19f21 100644 --- a/binfilter/bf_sfx2/source/inc/scriptcont.hxx +++ b/binfilter/bf_sfx2/source/inc/scriptcont.hxx @@ -2,9 +2,9 @@ * * $RCSfile: scriptcont.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:49 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer_Impl, public OldBas ( const ::rtl::OUString& aFile, SotStorageStreamRef xElementStream ); virtual void SAL_CALL importFromOldStorage( const ::rtl::OUString& aFile ); - virtual SfxLibraryContainer_Impl* createInstanceImpl( void ){DBG_ASSERT(0, "STRIP");return NULL;}//STRIP001 virtual SfxLibraryContainer_Impl* createInstanceImpl( void ); + virtual SfxLibraryContainer_Impl* createInstanceImpl( void ){DBG_BF_ASSERT(0, "STRIP");return NULL;}//STRIP001 virtual SfxLibraryContainer_Impl* createInstanceImpl( void ); // Password encryption diff --git a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx index 4d51df08a..fc039e887 100644 --- a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx +++ b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_eventsupplier.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:40:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -216,7 +216,7 @@ namespace binfilter { //-------------------------------------------------------------------------------------------------------- /*?*/ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUSTRING& aName ) throw ( RUNTIMEEXCEPTION ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 ::osl::MutexGuard aGuard( maMutex ); //STRIP001 //STRIP001 // find the event in the list and return the data @@ -236,14 +236,14 @@ namespace binfilter { // --- XElementAccess ( parent of XNameAccess ) --- //-------------------------------------------------------------------------------------------------------- /*?*/ UNOTYPE SAL_CALL SfxEvents_Impl::getElementType() throw ( RUNTIMEEXCEPTION ) -/*?*/ {DBG_ASSERT(0, "STRIP"); UNOTYPE aUNOTYPE; return aUNOTYPE; //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); UNOTYPE aUNOTYPE; return aUNOTYPE; //STRIP001 //STRIP001 UNOTYPE aElementType = ::getCppuType( (const SEQUENCE < PROPERTYVALUE > *)0 ); //STRIP001 return aElementType; /*?*/ } //-------------------------------------------------------------------------------------------------------- /*?*/ sal_Bool SAL_CALL SfxEvents_Impl::hasElements() throw ( RUNTIMEEXCEPTION ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 ::osl::MutexGuard aGuard( maMutex ); //STRIP001 //STRIP001 if ( maEventNames.getLength() ) diff --git a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx index a819e0836..2e25332da 100644 --- a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx +++ b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sfx2_printer.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:41:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -528,7 +528,7 @@ namespace binfilter { //-------------------------------------------------------------------- /*?*/ const SfxFont* SfxPrinter::GetFontByName( const String &rFontName ) -/*?*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 if ( !FONTS() ) //STRIP001 UpdateFonts_Impl(); //STRIP001 return SfxFindFont_Impl(*FONTS(), rFontName); diff --git a/binfilter/bf_starmath/source/mathtype.hxx b/binfilter/bf_starmath/source/mathtype.hxx index 79b6f853f..66b2bc92a 100644 --- a/binfilter/bf_starmath/source/mathtype.hxx +++ b/binfilter/bf_starmath/source/mathtype.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mathtype.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:41:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,13 +120,13 @@ public: MathType(String &rIn) : bSilent(sal_False),nDefaultSize(12),nLSize(0), nDSize(0),nCurSize(0),nLastSize(0),nVAlign(0),nHAlign(0),rRet(rIn) { - DBG_ASSERT(0, "STRIP"); //STRIP001 Init(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Init(); } MathType(String &rIn,SmNode *pIn) : bSilent(sal_False),nDefaultSize(12), nLSize(0),nDSize(0),nCurSize(0),nLastSize(0),nVAlign(0),nHAlign(2), pTree(pIn),rRet(rIn),nInsertion(0),nSpec(0) { - DBG_ASSERT(0, "STRIP"); //STRIP001Init(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001Init(); } //STRIP001 int Parse(SvStorage *pS); //STRIP001 int ConvertFromStarMath(SvStorage *pStor); diff --git a/binfilter/bf_starmath/source/starmath_cfgitem.cxx b/binfilter/bf_starmath/source/starmath_cfgitem.cxx index 1baee2884..ac251e9c0 100644 --- a/binfilter/bf_starmath/source/starmath_cfgitem.cxx +++ b/binfilter/bf_starmath/source/starmath_cfgitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: starmath_cfgitem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:41:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -279,7 +279,7 @@ static const char* aRootName = "Office.Math"; /*N*/ SmFontFormat::SmFontFormat( const Font &rFont ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 aName = rFont.GetName(); //STRIP001 nCharSet = (INT16) rFont.GetCharSet(); //STRIP001 nFamily = (INT16) rFont.GetFamily(); @@ -722,7 +722,7 @@ static const char* aRootName = "Office.Math"; /*N*/ if (!pFontFormatList) /*N*/ pFontFormatList = new SmFontFormatList; /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pFontFormatList->Clear(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pFontFormatList->Clear(); /*N*/ /*N*/ SmMathConfigItem aCfg( String::CreateFromAscii( aRootName ) ); /*N*/ @@ -834,7 +834,7 @@ static const char* aRootName = "Office.Math"; /*?*/ OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) ); /*?*/ for (USHORT i = 0; i < nCount; ++i) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 String aFntFmtId( rFntFmtList.GetFontFormatId( i ) ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 String aFntFmtId( rFntFmtList.GetFontFormatId( i ) ); //STRIP001 /*?*/ const SmFontFormat aFntFmt( *rFntFmtList.GetFontFormat( aFntFmtId ) ); //STRIP001 /*?*/ //STRIP001 /*?*/ OUString aNodeNameDelim( A2OU( FONT_FORMAT_LIST ) ); @@ -1154,7 +1154,7 @@ static const char* aRootName = "Office.Math"; /*?*/ /*?*/ if (!pFormat->IsDefaultFont( i )) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SmFontFormat aFntFmt( pFormat->GetFont( i ) ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SmFontFormat aFntFmt( pFormat->GetFont( i ) ); //STRIP001 /*?*/ aFntFmtId = GetFontFormatList().GetFontFormatId( aFntFmt, TRUE ); //STRIP001 /*?*/ DBG_ASSERT( aFntFmtId.getLength(), "FontFormatId not found" ); /*?*/ } @@ -1353,7 +1353,7 @@ static const char* aRootName = "Office.Math"; /*N*/ IMPL_LINK( SmMathConfig, TimeOut, Timer *, p ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Save(); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Save(); /*N*/ return 0; /*N*/ } diff --git a/binfilter/bf_starmath/source/starmath_document.cxx b/binfilter/bf_starmath/source/starmath_document.cxx index 41504f422..512361791 100644 --- a/binfilter/bf_starmath/source/starmath_document.cxx +++ b/binfilter/bf_starmath/source/starmath_document.cxx @@ -2,9 +2,9 @@ * * $RCSfile: starmath_document.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:41:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -752,7 +752,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*N*/ void SmDocShell::SetPrinter( SfxPrinter *pNew ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 delete pPrinter; //STRIP001 pPrinter = pNew; //Eigentumsuebergang! //STRIP001 pPrinter->SetMapMode( MapMode(MAP_100TH_MM) ); @@ -987,7 +987,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*N*/ if( pStor->IsStream( aTmpStr )) /*N*/ { /*N*/ // is this a MathType Storage? -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ MathType aEquation(aText); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ MathType aEquation(aText); //STRIP001 /*?*/ if (bRet = (1 == aEquation.Parse(pStor))) //STRIP001 /*?*/ Parse(); /*N*/ } @@ -1009,7 +1009,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*N*/ if( !bRet ) /*N*/ { /*?*/ pStor->Remove(String::CreateFromAscii(pStarMathDoc)); -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ bRet = Try2x(pStor, STREAM_READWRITE); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ bRet = Try2x(pStor, STREAM_READWRITE); /*?*/ pStor->Remove(C2S("\1Ole10Native")); /*N*/ } /*N*/ else @@ -1348,7 +1348,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*N*/ /*?*/ case SID_AUTO_REDRAW : /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SmModule *pp = SM_MOD1(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SmModule *pp = SM_MOD1(); //STRIP001 /*?*/ BOOL bRedraw = pp->GetConfig()->IsAutoRedraw(); //STRIP001 /*?*/ pp->GetConfig()->SetAutoRedraw(!bRedraw); /*?*/ } @@ -1356,7 +1356,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*?*/ /*?*/ case SID_SYMBOLS_CATALOGUE: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmSymbolDialog(NULL, GetSymSetManager()).Execute(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmSymbolDialog(NULL, GetSymSetManager()).Execute(); //STRIP001 /*?*/ RestartFocusTimer(); /*?*/ } /*?*/ break; @@ -1365,7 +1365,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*?*/ { /*?*/ SmViewShell *pView = SmGetActiveView(); /*?*/ if (pView) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pView->GetViewFrame()->ToggleChildWindow( //STRIP001 /*?*/ SmToolBoxWrapper::GetChildWindowId() ); /*?*/ } @@ -1374,7 +1374,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*?*/ /*?*/ case SID_INSERT_FORMULA: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SfxMedium *pMedium = SFX_APP()-> +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SfxMedium *pMedium = SFX_APP()-> //STRIP001 /*?*/ InsertDocumentDialog( 0, SmDocShell::Factory() ); //STRIP001 /*?*/ //STRIP001 /*?*/ if (pMedium != NULL) @@ -1398,16 +1398,16 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*?*/ break; /*?*/ /*?*/ case SID_LOADSYMBOLS: -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ LoadSymbols(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ LoadSymbols(); /*?*/ break; /*?*/ /*?*/ case SID_SAVESYMBOLS: -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ SaveSymbols(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ SaveSymbols(); /*?*/ break; /*?*/ /*?*/ case SID_FONT: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmFontTypeDialog *pFontTypeDialog = new SmFontTypeDialog(NULL); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmFontTypeDialog *pFontTypeDialog = new SmFontTypeDialog(NULL); //STRIP001 /*?*/ //STRIP001 /*?*/ pFontTypeDialog->ReadFrom(GetFormat()); //STRIP001 /*?*/ if (pFontTypeDialog->Execute() == RET_OK) @@ -1435,7 +1435,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*?*/ /*?*/ case SID_FONTSIZE: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmFontSizeDialog *pFontSizeDialog = new SmFontSizeDialog(NULL); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmFontSizeDialog *pFontSizeDialog = new SmFontSizeDialog(NULL); //STRIP001 /*?*/ //STRIP001 /*?*/ pFontSizeDialog->ReadFrom(GetFormat()); //STRIP001 /*?*/ if (pFontSizeDialog->Execute() == RET_OK) @@ -1464,7 +1464,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*?*/ /*?*/ case SID_DISTANCE: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmDistanceDialog *pDistanceDialog = new SmDistanceDialog(NULL); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmDistanceDialog *pDistanceDialog = new SmDistanceDialog(NULL); //STRIP001 /*?*/ //STRIP001 /*?*/ pDistanceDialog->ReadFrom(GetFormat()); //STRIP001 /*?*/ if (pDistanceDialog->Execute() == RET_OK) @@ -1494,7 +1494,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*?*/ /*?*/ case SID_ALIGN: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmAlignDialog *pAlignDialog = new SmAlignDialog(NULL); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SmAlignDialog *pAlignDialog = new SmAlignDialog(NULL); //STRIP001 /*?*/ //STRIP001 /*?*/ pAlignDialog->ReadFrom(GetFormat()); //STRIP001 /*?*/ if (pAlignDialog->Execute() == RET_OK) @@ -1579,7 +1579,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*?*/ case SOT_FORMATSTR_ID_STARMATH_50: /*?*/ case SOT_FORMATSTR_ID_STARMATH_40: /*?*/ //?? case SOT_FORMATSTR_ID_STARMATH: -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ Insert( xStore ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ Insert( xStore ); /*?*/ break; /*?*/ default: /*?*/ DBG_ERROR( "unexpected format ID" ); @@ -1654,7 +1654,7 @@ static const char __FAR_DATA pStarMathDoc[] = "StarMathDocument"; /*?*/ BOOL bState = FALSE; /*?*/ SmViewShell *pView = SmGetActiveView(); /*?*/ if (pView) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SfxChildWindow *pChildWnd = pView->GetViewFrame()-> //STRIP001 /*?*/ GetChildWindow( SmToolBoxWrapper::GetChildWindowId() ); //STRIP001 /*?*/ diff --git a/binfilter/bf_starmath/source/starmath_node.cxx b/binfilter/bf_starmath/source/starmath_node.cxx index 51ae5bfb6..395072be4 100644 --- a/binfilter/bf_starmath/source/starmath_node.cxx +++ b/binfilter/bf_starmath/source/starmath_node.cxx @@ -2,9 +2,9 @@ * * $RCSfile: starmath_node.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:36 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -258,7 +258,7 @@ namespace binfilter { /*N*/ void SmNode::SetColor(const Color& rColor) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (! (Flags() & FLG_COLOR)) //STRIP001 GetFont().SetColor(rColor); //STRIP001 @@ -482,7 +482,7 @@ namespace binfilter { /*N*/ } /*N*/ void SmNode::CreateTextFromNode(String &rText) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SmNode *pNode; //STRIP001 USHORT nSize = GetNumSubNodes(); //STRIP001 if (nSize > 1) @@ -2143,7 +2143,7 @@ namespace binfilter { /*N*/ break; /*N*/ case TUNKNOWN : break; // no assertion on "font <?> <?>" /*N*/ -/*?*/ case TPHANTOM : DBG_ASSERT(0, "STRIP"); break; //STRIP001 SetPhantom(TRUE); break; +/*?*/ case TPHANTOM : DBG_BF_ASSERT(0, "STRIP"); break; //STRIP001 SetPhantom(TRUE); break; /*N*/ case TBOLD : SetAttribut(ATTR_BOLD); break; /*N*/ case TITALIC : SetAttribut(ATTR_ITALIC); break; /*?*/ case TNBOLD : ClearAttribut(ATTR_BOLD); break; @@ -2241,7 +2241,7 @@ namespace binfilter { /*N*/ void SmPolyLineNode::Draw(OutputDevice &rDev, const Point &rPosition) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (IsPhantom()) //STRIP001 return; //STRIP001 @@ -2371,7 +2371,7 @@ namespace binfilter { /*N*/ void SmRectangleNode::Draw(OutputDevice &rDev, const Point &rPosition) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (IsPhantom()) //STRIP001 return; //STRIP001 diff --git a/binfilter/bf_starmath/source/starmath_parse.cxx b/binfilter/bf_starmath/source/starmath_parse.cxx index d8801ba9c..d2f646d18 100644 --- a/binfilter/bf_starmath/source/starmath_parse.cxx +++ b/binfilter/bf_starmath/source/starmath_parse.cxx @@ -2,9 +2,9 @@ * * $RCSfile: starmath_parse.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-25 13:39:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1083,14 +1083,14 @@ const sal_Int32 coNumContFlags = /*?*/ BufferString.Erase(BufferIndex, CurToken.aText.Len()); /*?*/ } /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pSNode = new SmAlignNode(CurToken); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pSNode = new SmAlignNode(CurToken); /*?*/ /*?*/ NextToken(); /*?*/ } /*?*/ } /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pSNode = new SmAlignNode(CurToken); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pSNode = new SmAlignNode(CurToken); //STRIP001 /*?*/ //STRIP001 /*?*/ NextToken(); //STRIP001 /*?*/ @@ -1236,7 +1236,7 @@ const sal_Int32 coNumContFlags = /*N*/ /*N*/ case TOVERBRACE : /*N*/ case TUNDERBRACE : -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pSNode = new SmVerticalBraceNode(CurToken); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pSNode = new SmVerticalBraceNode(CurToken); //STRIP001 /*?*/ pOper = new SmMathSymbolNode(CurToken); //STRIP001 /*?*/ NextToken(); /*?*/ break; @@ -1244,7 +1244,7 @@ const sal_Int32 coNumContFlags = /*?*/ case TWIDEBACKSLASH: /*?*/ case TWIDESLASH: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SmBinDiagonalNode *pSTmp = new SmBinDiagonalNode(CurToken); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SmBinDiagonalNode *pSTmp = new SmBinDiagonalNode(CurToken); //STRIP001 /*?*/ pSTmp->SetAscending(eType == TWIDESLASH); //STRIP001 /*?*/ pSNode = pSTmp; //STRIP001 /*?*/ diff --git a/binfilter/bf_starmath/source/starmath_smmod.cxx b/binfilter/bf_starmath/source/starmath_smmod.cxx index b58bc7c7e..0245e2a8a 100644 --- a/binfilter/bf_starmath/source/starmath_smmod.cxx +++ b/binfilter/bf_starmath/source/starmath_smmod.cxx @@ -2,9 +2,9 @@ * * $RCSfile: starmath_smmod.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:41:29 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -347,7 +347,7 @@ namespace binfilter { /*N*/ pSmView->GetGraphicWindow().ApplyColorConfigValues( rColorCfg ); /*N*/ SmEditWindow *pEditWin = pSmView->GetEditWindow(); /*N*/ if (pEditWin) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pEditWin->ApplyColorConfigValues( rColorCfg ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pEditWin->ApplyColorConfigValues( rColorCfg ); /*N*/ } /*N*/ pViewShell = SfxViewShell::GetNext( *pViewShell ); /*N*/ } diff --git a/binfilter/bf_starmath/source/starmath_symbol.cxx b/binfilter/bf_starmath/source/starmath_symbol.cxx index 9634533bc..27e43c25f 100644 --- a/binfilter/bf_starmath/source/starmath_symbol.cxx +++ b/binfilter/bf_starmath/source/starmath_symbol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: starmath_symbol.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:41:29 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -583,7 +583,7 @@ long SF_Ident = SF_IDENT; /*N*/ void SmSymSetManager::AddReplaceSymbol( const SmSym &rSymbol ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SmSym *pSym = GetSymbolByName( rSymbol.GetName() ); //STRIP001 if (pSym) //STRIP001 { diff --git a/binfilter/bf_starmath/source/starmath_utility.cxx b/binfilter/bf_starmath/source/starmath_utility.cxx index 9d325fe0e..33dca9022 100644 --- a/binfilter/bf_starmath/source/starmath_utility.cxx +++ b/binfilter/bf_starmath/source/starmath_utility.cxx @@ -2,9 +2,9 @@ * * $RCSfile: starmath_utility.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:36 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -269,7 +269,7 @@ namespace binfilter { /*N*/ { /*N*/ sal_Char cChar = ByteString::ConvertFromUnicode( ch, nEnc, FALSE ); /*N*/ if (cChar == 0) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ aString += ConvertUnknownCharacter(ch); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ aString += ConvertUnknownCharacter(ch); /*N*/ else /*N*/ aString += cChar; /*N*/ } @@ -325,7 +325,7 @@ static const struct /*N*/ while( STRING_NOTFOUND != ( nPreStart = /*N*/ aString.SearchAscii( PRE_TE, nPreStart )) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*N*/ // +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ // //STRIP001 /*N*/ // convert 'unknown character' to unicode character //STRIP001 /*N*/ // //STRIP001 /*?*/ xub_StrLen nTeStart = nPreStart + nPreLen; @@ -533,22 +533,22 @@ static const struct /*?*/ void * SmFontPickList::CreateItem(const String& rString) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new Font(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new Font(); /*?*/ } /*?*/ void * SmFontPickList::CreateItem(const void *pItem) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new Font(*((Font *) pItem)); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new Font(*((Font *) pItem)); /*?*/ } /*?*/ void SmFontPickList::DestroyItem(void *pItem) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete (Font *)pItem; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete (Font *)pItem; /*?*/ } /*?*/ BOOL SmFontPickList::CompareItem(const void *pFirstItem, const void *pSecondItem) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 Font *pFirstFont, *pSecondFont; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 Font *pFirstFont, *pSecondFont; //STRIP001 //STRIP001 pFirstFont = (Font *)pFirstItem; //STRIP001 pSecondFont = (Font *)pSecondItem; @@ -565,7 +565,7 @@ static const struct /*?*/ String SmFontPickList::GetStringItem(void *pItem) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); String aString; return aString;//STRIP001 Font *pFont; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); String aString; return aString;//STRIP001 Font *pFont; //STRIP001 String aString; //STRIP001 const sal_Char *pDelim = ", "; //STRIP001 @@ -589,12 +589,12 @@ static const struct /*?*/ void SmFontPickList::LoadItem(SvStream& rStream, void *pItem) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rStream >> *((Font *)pItem); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rStream >> *((Font *)pItem); /*?*/ } /*?*/ void SmFontPickList::SaveItem(SvStream& rStream, const void *pItem) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rStream << *(const Font *) pItem; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rStream << *(const Font *) pItem; /*?*/ } //STRIP001 void SmFontPickList::Insert(const Font &rFont) diff --git a/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx b/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx index d5b347324..4fc084f46 100644 --- a/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx +++ b/binfilter/bf_svx/source/dialog/svx_dlgutil.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_dlgutil.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:42:15 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -215,7 +215,7 @@ namespace binfilter { // ----------------------------------------------------------------------- /*N*/ FieldUnit GetModuleFieldUnit( const SfxItemSet* pSet ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ FieldUnit eUnit = FUNIT_INCH; //STRIP001 const SfxPoolItem* pItem = NULL; //STRIP001 if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) ) @@ -392,7 +392,7 @@ namespace binfilter { /*?*/ long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 long nOut = 0; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 long nOut = 0; //STRIP001 //STRIP001 switch ( eItem ) //STRIP001 { diff --git a/binfilter/bf_svx/source/dialog/svx_rulritem.cxx b/binfilter/bf_svx/source/dialog/svx_rulritem.cxx index 3e3e436f1..f486bb489 100644 --- a/binfilter/bf_svx/source/dialog/svx_rulritem.cxx +++ b/binfilter/bf_svx/source/dialog/svx_rulritem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_rulritem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:42:34 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -388,7 +388,7 @@ namespace binfilter { //------------------------------------------------------------------------ /*N*/ int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(!SfxPoolItem::operator==(rCmp) || //STRIP001 nActColumn != ((const SvxColumnItem&)rCmp).nActColumn || //STRIP001 nLeft != ((const SvxColumnItem&)rCmp).nLeft || @@ -635,7 +635,7 @@ namespace binfilter { /*N*/ nEndY ( nEY ), /*N*/ bLimits ( limits ) /*N*/ -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ } //------------------------------------------------------------------------ diff --git a/binfilter/bf_svx/source/dialog/svx_txencbox.cxx b/binfilter/bf_svx/source/dialog/svx_txencbox.cxx index d90a3ee4a..2ca1eb68b 100644 --- a/binfilter/bf_svx/source/dialog/svx_txencbox.cxx +++ b/binfilter/bf_svx/source/dialog/svx_txencbox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_txencbox.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:42:43 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,7 +92,7 @@ namespace binfilter { /*N*/ : /*N*/ ListBox( pParent, rResId ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 m_pEncTable = new SvxTextEncodingTable; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 m_pEncTable = new SvxTextEncodingTable; /*N*/ } //------------------------------------------------------------------------ diff --git a/binfilter/bf_svx/source/editeng/svx_editdoc.cxx b/binfilter/bf_svx/source/editeng/svx_editdoc.cxx index 088e6146c..cd9d4a0dc 100644 --- a/binfilter/bf_svx/source/editeng/svx_editdoc.cxx +++ b/binfilter/bf_svx/source/editeng/svx_editdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_editdoc.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:48 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -858,7 +858,7 @@ using namespace ::com::sun::star; /*N*/ #ifndef SVX_LIGHT /*N*/ if ( pWrongList ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bSep = ( GetChar( nIndex ) == ' ' ) || IsFeature( nIndex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bSep = ( GetChar( nIndex ) == ' ' ) || IsFeature( nIndex ); //STRIP001 /*?*/ pWrongList->TextInserted( nIndex, nNew, bSep ); /*N*/ } /*N*/ #endif // !SVX_LIGHT @@ -950,7 +950,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ #ifndef SVX_LIGHT /*N*/ if ( pWrongList ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pWrongList->TextDeleted( nIndex, nDeleted ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pWrongList->TextDeleted( nIndex, nDeleted ); /*N*/ #endif // !SVX_LIGHT /*N*/ /*N*/ #ifdef EDITDEBUG @@ -1080,7 +1080,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ void ContentNode::SetStyleSheet( SfxStyleSheet* pS, const SvxFont& rFontFromStyle ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 aContentAttribs.SetStyleSheet( pS ); //STRIP001 //STRIP001 // Erst alle Informationen aus dem Style verwenden... diff --git a/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx b/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx index b35ad34b5..1221a85a5 100644 --- a/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx +++ b/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_editdoc2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:48 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,7 +185,7 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle ) // ------------------------------------------------------------------------- /*N*/ ExtraPortionInfo::ExtraPortionInfo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 nOrgWidth = 0; //STRIP001 nWidthFullCompression = 0; //STRIP001 nMaxCompression100thPercent = 0; @@ -197,7 +197,7 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle ) /*N*/ } /*N*/ ExtraPortionInfo::~ExtraPortionInfo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 delete[] pOrgDXArray; /*N*/ } @@ -426,7 +426,7 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle ) /*N*/ switch ( rPoolItem.Which() ) /*N*/ { /*N*/ case EE_PARA_LRSPACE: -/*N*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 DBG_ASSERT( rPoolItem.IsA( TYPE( SvxLRSpaceItem ) ), "ConvertItem: Ungueltiges Item!" ); //STRIP001 SvxLRSpaceItem& rItem = (SvxLRSpaceItem&)rPoolItem; //STRIP001 rItem.SetTxtFirstLineOfst( OutputDevice::LogicToLogic( rItem.GetTxtFirstLineOfst(), eSourceUnit, eDestUnit ) ); @@ -436,7 +436,7 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle ) /*N*/ } /*N*/ break; /*N*/ case EE_PARA_ULSPACE: -/*N*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 DBG_ASSERT( rPoolItem.IsA( TYPE( SvxULSpaceItem ) ), "ConvertItem: Ungueltiges Item!" ); //STRIP001 SvxULSpaceItem& rItem = (SvxULSpaceItem&)rPoolItem; //STRIP001 rItem.SetUpper( OutputDevice::LogicToLogic( rItem.GetUpper(), eSourceUnit, eDestUnit ) ); @@ -444,7 +444,7 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle ) /*N*/ } /*N*/ break; /*N*/ case EE_PARA_SBL: -/*N*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 DBG_ASSERT( rPoolItem.IsA( TYPE( SvxLineSpacingItem ) ), "ConvertItem: Ungueltiges Item!" ); //STRIP001 SvxLineSpacingItem& rItem = (SvxLineSpacingItem&)rPoolItem; //STRIP001 // #96298# SetLineHeight changes also eLineSpace! @@ -453,7 +453,7 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle ) /*N*/ } /*N*/ break; /*N*/ case EE_PARA_TABS: -/*N*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 DBG_ASSERT( rPoolItem.IsA( TYPE( SvxTabStopItem ) ), "ConvertItem: Ungueltiges Item!" ); //STRIP001 SvxTabStopItem& rItem = (SvxTabStopItem&)rPoolItem; //STRIP001 SvxTabStopItem aNewItem( EE_PARA_TABS ); @@ -469,7 +469,7 @@ BOOL EditStyleSheet::HasStyleAsAnyParent( SfxStyleSheet& rStyle ) /*N*/ case EE_CHAR_FONTHEIGHT: /*N*/ case EE_CHAR_FONTHEIGHT_CJK: /*N*/ case EE_CHAR_FONTHEIGHT_CTL: -/*N*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 DBG_ASSERT( rPoolItem.IsA( TYPE( SvxFontHeightItem ) ), "ConvertItem: Ungueltiges Item!" ); //STRIP001 SvxFontHeightItem& rItem = (SvxFontHeightItem&)rPoolItem; //STRIP001 rItem.SetHeight( OutputDevice::LogicToLogic( rItem.GetHeight(), eSourceUnit, eDestUnit ) ); diff --git a/binfilter/bf_svx/source/editeng/svx_editeng.cxx b/binfilter/bf_svx/source/editeng/svx_editeng.cxx index ba5274029..8469eea29 100644 --- a/binfilter/bf_svx/source/editeng/svx_editeng.cxx +++ b/binfilter/bf_svx/source/editeng/svx_editeng.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_editeng.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:38 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -526,7 +526,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ { /*N*/ for ( sal_uInt16 nView = 0; nView < pImpEditEngine->aEditViews.Count(); nView++ ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EditView* pView = pImpEditEngine->aEditViews[nView]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EditView* pView = pImpEditEngine->aEditViews[nView]; //STRIP001 /*?*/ DBG_CHKOBJ( pView, EditView, 0 ); //STRIP001 /*?*/ if ( bAutoPageSize ) //STRIP001 /*?*/ pView->pImpEditView->RecalcOutputArea(); @@ -730,13 +730,13 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ } /*N*/ sal_uInt16 EditEngine::GetLineLen( sal_uInt16 nParagraph, sal_uInt16 nLine ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 //STRIP001 /*?*/ DBG_CHKTHIS( EditEngine, 0 ); //STRIP001 /*?*/ return pImpEditEngine->GetLineLen( nParagraph, nLine ); /*N*/ } /*?*/ sal_uInt32 EditEngine::GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine ) -/*?*/ {{DBG_ASSERT(0, "STRIP");} return 0;//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 //STRIP001 DBG_CHKTHIS( EditEngine, 0 ); //STRIP001 // Falls jemand mit einer leeren Engine ein GetLineHeight() macht. //STRIP001 if ( !pImpEditEngine->IsFormatted() ) @@ -754,7 +754,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ } /*N*/ sal_uInt32 EditEngine::GetTextHeight( sal_uInt16 nParagraph ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 //STRIP001 /*?*/ DBG_CHKTHIS( EditEngine, 0 ); //STRIP001 /*?*/ //STRIP001 /*?*/ if ( !pImpEditEngine->IsFormatted() ) @@ -823,7 +823,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); //STRIP001 } /*?*/ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView ) -/*?*/ {{DBG_ASSERT(0, "STRIP"); } return sal_False;//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); } return sal_False;//STRIP001 //STRIP001 /*?*/ DBG_CHKTHIS( EditEngine, 0 ); //STRIP001 /*?*/ DBG_CHKOBJ( pEditView, EditView, 0 ); //STRIP001 /*?*/ DBG_ASSERT( pEditView, "Keine View - keine Kekse !" ); @@ -845,7 +845,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); //STRIP001 /*?*/ //STRIP001 /*?*/ String aAutoText( pImpEditEngine->GetAutoCompleteText() ); //STRIP001 /*?*/ if ( pImpEditEngine->GetAutoCompleteText().Len() ) -//STRIP001 /*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pImpEditEngine->SetAutoCompleteText( String(), sal_True ); +//STRIP001 /*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pImpEditEngine->SetAutoCompleteText( String(), sal_True ); //STRIP001 /*?*/ //STRIP001 /*?*/ sal_uInt16 nCode = rKeyEvent.GetKeyCode().GetCode(); //STRIP001 /*?*/ KeyFuncType eFunc = rKeyEvent.GetKeyCode().GetFunction(); @@ -856,14 +856,14 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); //STRIP001 /*?*/ case KEYFUNC_UNDO: //STRIP001 /*?*/ { //STRIP001 /*?*/ if ( !bReadOnly ) -//STRIP001 /*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pEditView->Undo(); +//STRIP001 /*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pEditView->Undo(); //STRIP001 /*?*/ return sal_True; //STRIP001 /*?*/ } //STRIP001 /*?*/ // break; //STRIP001 /*?*/ case KEYFUNC_REDO: //STRIP001 /*?*/ { //STRIP001 /*?*/ if ( !bReadOnly ) -//STRIP001 /*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pEditView->Redo(); +//STRIP001 /*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pEditView->Redo(); //STRIP001 /*?*/ return sal_True; //STRIP001 /*?*/ } //STRIP001 /*?*/ // break; @@ -1253,7 +1253,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ } /*N*/ sal_uInt32 EditEngine::Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ ) -/*N*/ {DBG_ASSERT(0, "STRIP");return 0; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");return 0; //STRIP001 //STRIP001 DBG_CHKTHIS( EditEngine, 0 ); //STRIP001 sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled(); //STRIP001 pImpEditEngine->EnableUndo( sal_False ); @@ -1266,7 +1266,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); #ifndef SVX_LIGHT /*N*/ sal_uInt32 EditEngine::Write( SvStream& rOutput, EETextFormat eFormat ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 DBG_CHKTHIS( EditEngine, 0 ); //STRIP001 EditPaM aStartPaM( pImpEditEngine->GetEditDoc().GetStartPaM() ); //STRIP001 EditPaM aEndPaM( pImpEditEngine->GetEditDoc().GetEndPaM() ); @@ -1570,7 +1570,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ } /*N*/ void EditEngine::GetCharAttribs( sal_uInt16 nPara, EECharAttribArray& rLst ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS( EditEngine, 0 ); //STRIP001 pImpEditEngine->GetCharAttribs( nPara, rLst ); /*N*/ } @@ -2249,7 +2249,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ DBG_CHKTHIS( EditEngine, 0 ); /*N*/ if ( pImpEditEngine->GetStatus().DoOnlineSpelling() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pImpEditEngine->StopOnlineSpellTimer(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pImpEditEngine->StopOnlineSpellTimer(); //STRIP001 /*?*/ pImpEditEngine->DoOnlineSpelling( 0, sal_True, sal_False ); /*N*/ } /*N*/ #endif SVX_LIGHT @@ -2280,7 +2280,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ /*N*/ // #109151# Check against index, not paragraph /*N*/ if ( pNode && ( rPos.nIndex < pNode->Len() ) ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aBounds = pImpEditEngine->PaMtoEditCursor( EditPaM( pNode, rPos.nIndex ), GETCRSR_TXTONLY ); //STRIP001 /*?*/ Rectangle aR2 = pImpEditEngine->PaMtoEditCursor( EditPaM( pNode, rPos.nIndex+1 ), GETCRSR_TXTONLY|GETCRSR_ENDOFLINE ); //STRIP001 /*?*/ if ( aR2.Right() > aBounds.Right() ) @@ -2345,7 +2345,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ /*N*/ if ( GetNotifyHdl().IsSet() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_PARAGRAPHINSERTED ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_PARAGRAPHINSERTED ); //STRIP001 /*?*/ aNotify.pEditEngine = this; //STRIP001 /*?*/ aNotify.nParagraph = nPara; //STRIP001 /*?*/ pImpEditEngine->CallNotify( aNotify ); @@ -2358,7 +2358,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ /*N*/ if ( GetNotifyHdl().IsSet() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_PARAGRAPHREMOVED ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_PARAGRAPHREMOVED ); //STRIP001 /*?*/ aNotify.pEditEngine = this; //STRIP001 /*?*/ aNotify.nParagraph = nPara; //STRIP001 /*?*/ pImpEditEngine->CallNotify( aNotify ); @@ -2388,7 +2388,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ /*N*/ if ( GetNotifyHdl().IsSet() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_TEXTHEIGHTCHANGED ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_TEXTHEIGHTCHANGED ); //STRIP001 /*?*/ aNotify.pEditEngine = this; //STRIP001 /*?*/ aNotify.nParagraph = nPara; //STRIP001 /*?*/ pImpEditEngine->CallNotify( aNotify ); @@ -2702,7 +2702,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib ); /*N*/ } /*N*/ else if( eNumType == SVX_NUM_BITMAP ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SvxBrushItem aBItem( Graphic( pOldBullet->GetBitmap() ), GPOS_NONE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SvxBrushItem aBItem( Graphic( pOldBullet->GetBitmap() ), GPOS_NONE ); //STRIP001 /*?*/ pNumberFormat->SetGraphicBrush( &aBItem ); /*N*/ } /*N*/ } diff --git a/binfilter/bf_svx/source/editeng/svx_editobj.cxx b/binfilter/bf_svx/source/editeng/svx_editobj.cxx index 5f3a23a33..0b65debc8 100644 --- a/binfilter/bf_svx/source/editeng/svx_editobj.cxx +++ b/binfilter/bf_svx/source/editeng/svx_editobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_editobj.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:38 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,7 +114,7 @@ namespace binfilter { /*N*/ /*N*/ if ( pFmt->GetBrush() && pFmt->GetBrush()->GetGraphic() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Bitmap aBmp( pFmt->GetBrush()->GetGraphic()->GetBitmap() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Bitmap aBmp( pFmt->GetBrush()->GetGraphic()->GetBitmap() ); //STRIP001 /*?*/ aBmp.SetPrefSize( pFmt->GetGraphicSize() ); //STRIP001 /*?*/ aBmp.SetPrefMapMode( MAP_100TH_MM ); //STRIP001 /*?*/ rBullet.SetBitmap( aBmp ); @@ -233,7 +233,7 @@ namespace binfilter { /*N*/ pTempLoadStoreInfos = NULL; /*N*/ #ifndef SVX_LIGHT /*N*/ if ( rCopyFrom.GetWrongList() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pWrongs = rCopyFrom.GetWrongList()->Clone(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pWrongs = rCopyFrom.GetWrongList()->Clone(); /*N*/ #endif // !SVX_LIGHT /*N*/ // So sollten die Items im richtigen Pool landen! /*N*/ aParaAttribs.Set( rCopyFrom.GetParaAttribs() ); @@ -253,7 +253,7 @@ namespace binfilter { /*N*/ pWrongs = NULL; /*N*/ #ifndef SVX_LIGHT /*N*/ if ( rCopyFrom.GetWrongList() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pWrongs = rCopyFrom.GetWrongList()->Clone(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pWrongs = rCopyFrom.GetWrongList()->Clone(); /*N*/ #endif // !SVX_LIGHT /*N*/ } @@ -308,7 +308,7 @@ namespace binfilter { /*N*/ } /*N*/ XubString EditTextObject::GetText( USHORT nParagraph ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return XubString();//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return XubString();//STRIP001 //STRIP001 DBG_ERROR( "V-Methode direkt vom EditTextObject!" ); //STRIP001 return XubString(); /*N*/ } @@ -461,7 +461,7 @@ namespace binfilter { /*N*/ } /*N*/ void EditTextObject::SetVertical( BOOL bVertical ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ERROR( "V-Methode direkt vom EditTextObject!" ); //STRIP001 ((BinTextObject*)this)->SetVertical( bVertical ); /*N*/ } @@ -1047,7 +1047,7 @@ namespace binfilter { /*N*/ } /*N*/ void BinTextObject::SetStyleSheet( USHORT nPara, const XubString& rName, const SfxStyleFamily& rFamily ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( nPara < aContents.Count() ) //STRIP001 { //STRIP001 ContentInfo* pC = aContents[ nPara ]; diff --git a/binfilter/bf_svx/source/editeng/svx_editsel.cxx b/binfilter/bf_svx/source/editeng/svx_editsel.cxx index 1dff06786..1d74fbb51 100644 --- a/binfilter/bf_svx/source/editeng/svx_editsel.cxx +++ b/binfilter/bf_svx/source/editeng/svx_editsel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_editsel.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ namespace binfilter { /*N*/ } /*N*/ void __EXPORT EditSelFunctionSet::CreateAnchor() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pCurView ) //STRIP001 pCurView->pImpEditView->CreateAnchor(); /*N*/ } @@ -88,7 +88,7 @@ namespace binfilter { /*N*/ } /*N*/ BOOL __EXPORT EditSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOOL ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pCurView ) //STRIP001 return pCurView->pImpEditView->SetCursorAtPoint( rPointPixel ); //STRIP001 @@ -96,7 +96,7 @@ namespace binfilter { /*N*/ } /*N*/ BOOL __EXPORT EditSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pCurView ) //STRIP001 return pCurView->pImpEditView->IsSelectionAtPoint( rPointPixel ); //STRIP001 @@ -117,7 +117,7 @@ namespace binfilter { /*N*/ void __EXPORT EditSelFunctionSet::DeselectAll() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pCurView ) //STRIP001 pCurView->pImpEditView->DeselectAll(); /*N*/ } diff --git a/binfilter/bf_svx/source/editeng/svx_editundo.cxx b/binfilter/bf_svx/source/editeng/svx_editundo.cxx index 177c896d0..8c0a8e164 100644 --- a/binfilter/bf_svx/source/editeng/svx_editundo.cxx +++ b/binfilter/bf_svx/source/editeng/svx_editundo.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_editundo.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:49 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -369,14 +369,14 @@ DBG_NAME( EditUndo ) /*N*/ } /*N*/ void __EXPORT EditUndoSplitPara::Undo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 EditPaM aPaM = GetImpEditEngine()->ConnectContents( nNode, FALSE ); //STRIP001 GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) ); /*N*/ } /*N*/ void __EXPORT EditUndoSplitPara::Redo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 EditPaM aPaM = GetImpEditEngine()->SplitContent( nNode, nSepPos ); //STRIP001 GetImpEditEngine()->GetActiveView()->GetImpEditView()->SetEditSelection( EditSelection( aPaM, aPaM ) ); @@ -397,7 +397,7 @@ DBG_NAME( EditUndo ) /*N*/ } /*N*/ void __EXPORT EditUndoInsertChars::Undo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) ); //STRIP001 EditSelection aSel( aPaM, aPaM ); @@ -407,7 +407,7 @@ DBG_NAME( EditUndo ) /*N*/ } /*N*/ void __EXPORT EditUndoInsertChars::Redo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) ); //STRIP001 GetImpEditEngine()->ImpInsertText( EditSelection( aPaM, aPaM ), aText ); @@ -489,7 +489,7 @@ DBG_NAME( EditUndo ) /*N*/ } /*N*/ void __EXPORT EditUndoInsertFeature::Undo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) ); //STRIP001 EditSelection aSel( aPaM, aPaM ); @@ -501,7 +501,7 @@ DBG_NAME( EditUndo ) /*N*/ } /*N*/ void __EXPORT EditUndoInsertFeature::Redo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 EditPaM aPaM( GetImpEditEngine()->CreateEditPaM( aEPaM ) ); //STRIP001 EditSelection aSel( aPaM, aPaM ); @@ -587,7 +587,7 @@ DBG_NAME( EditUndo ) /*N*/ } /*N*/ void __EXPORT EditUndoSetStyleSheet::Undo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 GetImpEditEngine()->SetStyleSheet( nPara, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aPrevName, ePrevFamily ) ); //STRIP001 GetImpEditEngine()->SetParaAttribs( nPara, aPrevParaAttribs ); @@ -595,7 +595,7 @@ DBG_NAME( EditUndo ) /*N*/ } /*N*/ void __EXPORT EditUndoSetStyleSheet::Redo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 GetImpEditEngine()->SetStyleSheet( nPara, (SfxStyleSheet*)GetImpEditEngine()->GetStyleSheetPool()->Find( aNewName, eNewFamily ) ); //STRIP001 lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara ); @@ -622,14 +622,14 @@ DBG_NAME( EditUndo ) /*N*/ } /*N*/ void __EXPORT EditUndoSetParaAttribs::Undo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 GetImpEditEngine()->SetParaAttribs( nPara, aPrevItems ); //STRIP001 lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara ); /*N*/ } /*N*/ void __EXPORT EditUndoSetParaAttribs::Redo() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_ASSERT( GetImpEditEngine()->GetActiveView(), "Undo/Redo: Keine Active View!" ); //STRIP001 GetImpEditEngine()->SetParaAttribs( nPara, aNewItems ); //STRIP001 lcl_DoSetSelection( GetImpEditEngine()->GetActiveView(), nPara ); diff --git a/binfilter/bf_svx/source/editeng/svx_editview.cxx b/binfilter/bf_svx/source/editeng/svx_editview.cxx index da0d70b92..9c3987a3e 100644 --- a/binfilter/bf_svx/source/editeng/svx_editview.cxx +++ b/binfilter/bf_svx/source/editeng/svx_editview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_editview.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:50 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -229,14 +229,14 @@ using namespace ::com::sun::star::linguistic2; /*N*/ ParaPortion* pPortion = PIMPEE->FindParaPortion( aNewSelection.Min().GetNode() ); /*N*/ if ( !pPortion->IsVisible() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pPortion = PIMPEE->GetPrevVisPortion( pPortion ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pPortion = PIMPEE->GetPrevVisPortion( pPortion ); //STRIP001 /*?*/ ContentNode* pNode = pPortion ? pPortion->GetNode() : PIMPEE->GetEditDoc().GetObject( 0 ); //STRIP001 /*?*/ aNewSelection.Min() = EditPaM( pNode, pNode->Len() ); /*N*/ } /*N*/ pPortion = PIMPEE->FindParaPortion( aNewSelection.Max().GetNode() ); /*N*/ if ( !pPortion->IsVisible() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pPortion = PIMPEE->GetPrevVisPortion( pPortion ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pPortion = PIMPEE->GetPrevVisPortion( pPortion ); //STRIP001 /*?*/ ContentNode* pNode = pPortion ? pPortion->GetNode() : PIMPEE->GetEditDoc().GetObject( 0 ); //STRIP001 /*?*/ aNewSelection.Max() = EditPaM( pNode, pNode->Len() ); /*N*/ } @@ -315,7 +315,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ } /*N*/ void EditView::SetVisArea( const Rectangle& rRec ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS( EditView, 0 ); //STRIP001 pImpEditView->SetVisDocStartPos( rRec.TopLeft() ); /*N*/ } @@ -337,7 +337,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ // Rest nur hier, wenn API-Aufruf: /*N*/ pImpEditView->CalcAnchorPoint(); /*N*/ if ( PIMPEE->GetStatus().AutoPageSize() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pImpEditView->RecalcOutputArea(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pImpEditView->RecalcOutputArea(); /*N*/ pImpEditView->ShowCursor( sal_False, sal_False ); /*N*/ } @@ -577,21 +577,21 @@ using namespace ::com::sun::star::linguistic2; #endif /*N*/ void EditView::Cut() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS( EditView, 0 ); //STRIP001 Reference< ::com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); //STRIP001 pImpEditView->CutCopy( aClipBoard, sal_True ); /*N*/ } /*N*/ void EditView::Copy() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS( EditView, 0 ); //STRIP001 Reference< ::com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); //STRIP001 pImpEditView->CutCopy( aClipBoard, sal_False ); /*N*/ } /*N*/ void EditView::Paste() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS( EditView, 0 ); //STRIP001 Reference< ::com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); //STRIP001 pImpEditView->Paste( aClipBoard, sal_False ); @@ -787,7 +787,7 @@ using namespace ::com::sun::star::linguistic2; //STRIP001 } /*N*/ void EditView::SetStyleSheet( SfxStyleSheet* pStyle ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS( EditView, 0 ); //STRIP001 DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); //STRIP001 diff --git a/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx b/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx index e44ce3f63..2c2d841c7 100644 --- a/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx +++ b/binfilter/bf_svx/source/editeng/svx_forbiddencharacterstable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_forbiddencharacterstable.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:09 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,7 @@ namespace binfilter { /*N*/ } /*N*/ void SvxForbiddenCharactersTable::ClearForbiddenCharacters( USHORT nLanguage ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ForbiddenCharactersInfo* pInf = Get( nLanguage ); //STRIP001 if ( pInf ) //STRIP001 { diff --git a/binfilter/bf_svx/source/editeng/svx_impedit.cxx b/binfilter/bf_svx/source/editeng/svx_impedit.cxx index 0a70625cf..58cf79d54 100644 --- a/binfilter/bf_svx/source/editeng/svx_impedit.cxx +++ b/binfilter/bf_svx/source/editeng/svx_impedit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_impedit.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -204,7 +204,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ /*N*/ if ( pEditEngine->pImpEditEngine->GetNotifyHdl().IsSet() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_TEXTVIEWSELECTIONCHANGED ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_TEXTVIEWSELECTIONCHANGED ); //STRIP001 /*?*/ aNotify.pEditEngine = pEditEngine; //STRIP001 /*?*/ aNotify.pEditView = GetEditViewPtr(); //STRIP001 /*?*/ pEditEngine->pImpEditEngine->CallNotify( aNotify ); @@ -276,14 +276,14 @@ using namespace ::com::sun::star::linguistic2; /*?*/ sal_uInt16 nStartLine = 0; /*?*/ sal_uInt16 nEndLine = pTmpPortion->GetLines().Count() -1; /*?*/ if ( nPara == nStartPara ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nStartLine = pTmpPortion->GetLines().FindLine( aTmpSel.Min().GetIndex(), sal_False ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nStartLine = pTmpPortion->GetLines().FindLine( aTmpSel.Min().GetIndex(), sal_False ); /*?*/ if ( nPara == nEndPara ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nEndLine = pTmpPortion->GetLines().FindLine( aTmpSel.Max().GetIndex(), sal_True ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nEndLine = pTmpPortion->GetLines().FindLine( aTmpSel.Max().GetIndex(), sal_True ); /*?*/ /*?*/ // ueber die Zeilen iterieren.... /*?*/ for ( sal_uInt16 nLine = nStartLine; nLine <= nEndLine; nLine++ ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EditLine* pLine = pTmpPortion->GetLines().GetObject( nLine ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EditLine* pLine = pTmpPortion->GetLines().GetObject( nLine ); //STRIP001 /*?*/ DBG_ASSERT( pLine, "Zeile nicht gefunden: DrawSelection()" ); //STRIP001 /*?*/ //STRIP001 /*?*/ BOOL bPartOfLine = FALSE; @@ -1063,7 +1063,7 @@ using namespace ::com::sun::star::linguistic2; /*?*/ { /*?*/ if ( !bReadOnly ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Reference< ::com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Reference< ::com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); //STRIP001 /*?*/ CutCopy( aClipBoard, sal_True ); //STRIP001 /*?*/ bDone = sal_True; /*?*/ } @@ -1071,7 +1071,7 @@ using namespace ::com::sun::star::linguistic2; /*?*/ break; /*?*/ case KEYFUNC_COPY: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Reference< ::com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Reference< ::com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); //STRIP001 /*?*/ CutCopy( aClipBoard, sal_False ); //STRIP001 /*?*/ bDone = TRUE; /*?*/ } @@ -1080,7 +1080,7 @@ using namespace ::com::sun::star::linguistic2; /*?*/ { /*?*/ if ( !bReadOnly && IsPasteEnabled() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_PASTE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pEditEngine->pImpEditEngine->UndoActionStart( EDITUNDO_PASTE ); //STRIP001 /*?*/ Reference< ::com::sun::star::datatransfer::clipboard::XClipboard> aClipBoard(GetWindow()->GetClipboard()); //STRIP001 /*?*/ Paste( aClipBoard, pEditEngine->pImpEditEngine->GetStatus().AllowPasteSpecial() ); //STRIP001 /*?*/ pEditEngine->pImpEditEngine->UndoActionEnd( EDITUNDO_PASTE ); diff --git a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx index 61941025d..c9b536a05 100644 --- a/binfilter/bf_svx/source/editeng/svx_impedit2.cxx +++ b/binfilter/bf_svx/source/editeng/svx_impedit2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_impedit2.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: cl $ $Date: 2004-04-02 07:48:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -833,7 +833,7 @@ using namespace ::com::sun::star; /*N*/ { /*N*/ // Leere Attribute loeschen, aber nur, wenn Absatz nicht leer! /*N*/ if ( pPrevNode->GetCharAttribs().HasEmptyAttribs() && pPrevNode->Len() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pPrevNode->GetCharAttribs().DeleteEmptyAttribs( aEditDoc.GetItemPool() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pPrevNode->GetCharAttribs().DeleteEmptyAttribs( aEditDoc.GetItemPool() ); /*N*/ } /*N*/ void ImpEditEngine::TextModified() @@ -842,7 +842,7 @@ using namespace ::com::sun::star; /*N*/ /*N*/ if ( GetNotifyHdl().IsSet() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_TEXTMODIFIED ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EENotify aNotify( EE_NOTIFY_TEXTMODIFIED ); //STRIP001 /*?*/ aNotify.pEditEngine = GetEditEnginePtr(); //STRIP001 /*?*/ CallNotify( aNotify ); /*N*/ } @@ -2059,7 +2059,7 @@ using namespace ::com::sun::star; /*N*/ #ifndef SVX_LIGHT /*N*/ if ( IsUndoEnabled() && !IsInUndo() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 InsertUndo( new EditUndoConnectParas( this, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 InsertUndo( new EditUndoConnectParas( this, //STRIP001 /*?*/ aEditDoc.GetPos( pLeft ), pLeft->Len(), //STRIP001 /*?*/ pLeft->GetContentAttribs().GetItems(), pRight->GetContentAttribs().GetItems(), //STRIP001 /*?*/ pLeft->GetStyleSheet(), pRight->GetStyleSheet(), bBackward ) ); @@ -2085,7 +2085,7 @@ using namespace ::com::sun::star; /*N*/ #ifndef SVX_LIGHT /*N*/ if ( GetStatus().DoOnlineSpelling() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 xub_StrLen nEnd = pLeft->Len(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 xub_StrLen nEnd = pLeft->Len(); //STRIP001 /*?*/ xub_StrLen nInv = nEnd ? nEnd-1 : nEnd; //STRIP001 /*?*/ pLeft->GetWrongList()->ClearWrongs( nInv, 0xFFFF, pLeft ); // Evtl. einen wegnehmen //STRIP001 /*?*/ pLeft->GetWrongList()->MarkInvalid( nInv, nEnd+1 ); @@ -2231,7 +2231,7 @@ using namespace ::com::sun::star; /*N*/ for ( ULONG z = nStartNode+1; z < nEndNode; z++ ) /*N*/ { /*?*/ // Immer nStartNode+1, wegen Remove()! -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImpRemoveParagraph( nStartNode+1 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImpRemoveParagraph( nStartNode+1 ); /*N*/ } /*N*/ /*N*/ if ( aStartPaM.GetNode() != aEndPaM.GetNode() ) @@ -2530,7 +2530,7 @@ using namespace ::com::sun::star; /*N*/ #ifndef SVX_LIGHT /*N*/ if ( GetStatus().DoOnlineSpelling() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 xub_StrLen nEnd = rPaM.GetNode()->Len(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 xub_StrLen nEnd = rPaM.GetNode()->Len(); //STRIP001 /*?*/ aPaM.GetNode()->CreateWrongList(); //STRIP001 /*?*/ WrongList* pLWrongs = rPaM.GetNode()->GetWrongList(); //STRIP001 /*?*/ WrongList* pRWrongs = aPaM.GetNode()->GetWrongList(); @@ -2584,7 +2584,7 @@ using namespace ::com::sun::star; /*N*/ #ifndef SVX_LIGHT /*N*/ if ( IsUndoEnabled() && !IsInUndo() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( nPara ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( nPara ) //STRIP001 /*?*/ { //STRIP001 /*?*/ DBG_ASSERT( aEditDoc.SaveGetObject( nPara-1 ), "FastInsertParagraph: Prev existiert nicht" ); //STRIP001 /*?*/ InsertUndo( new EditUndoSplitPara( this, nPara-1, aEditDoc.GetObject( nPara-1 )->Len() ) ); @@ -3469,7 +3469,7 @@ using namespace ::com::sun::star; /*N*/ if ( nCurIndex && ( nCurIndex == pLine->GetEnd() ) && /*N*/ ( pLine != pPortion->GetLines().GetObject( pPortion->GetLines().Count()-1) ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aPaM = CursorLeft( aPaM, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aPaM = CursorLeft( aPaM, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL ); /*N*/ } /*N*/ /*N*/ return aPaM; diff --git a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx index 8daf57f4c..677b85a10 100644 --- a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx +++ b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_impedit3.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:52 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -358,7 +358,7 @@ struct TabInfo /*N*/ } /*N*/ IMPL_LINK( ImpEditEngine, OnlineSpellHdl, Timer *, EMPTYARG ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !Application::AnyInput( INPUT_KEYBOARD ) && GetUpdateMode() && IsFormatted() ) //STRIP001 DoOnlineSpelling(); //STRIP001 else @@ -503,7 +503,7 @@ struct TabInfo /*N*/ ImpEditView* pImpView = pView->pImpEditView; /*N*/ if ( pImpView->DoAutoHeight() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Size aSz( pImpView->GetOutputArea().GetWidth(), nCurTextHeight ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Size aSz( pImpView->GetOutputArea().GetWidth(), nCurTextHeight ); //STRIP001 /*?*/ if ( aSz.Height() > aMaxAutoPaperSize.Height() ) //STRIP001 /*?*/ aSz.Height() = aMaxAutoPaperSize.Height(); //STRIP001 /*?*/ else if ( aSz.Height() < aMinAutoPaperSize.Height() ) @@ -603,7 +603,7 @@ struct TabInfo /*N*/ /*N*/ for ( sal_uInt16 nView = 0; nView < aEditViews.Count(); nView++ ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EditView* pView = aEditViews[nView]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EditView* pView = aEditViews[nView]; //STRIP001 /*?*/ pView->pImpEditView->RecalcOutputArea(); /*N*/ } /*N*/ } @@ -839,7 +839,7 @@ struct TabInfo /*N*/ long nTextLineHeight = 0; /*N*/ if ( GetTextRanger() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 GetTextRanger()->SetVertical( IsVertical() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 GetTextRanger()->SetVertical( IsVertical() ); //STRIP001 /*?*/ //STRIP001 /*?*/ long nTextY = nStartPosY + GetEditCursor( pParaPortion, pLine->GetStart() ).Top(); //STRIP001 /*?*/ if ( !bSameLineAgain ) @@ -1069,7 +1069,7 @@ struct TabInfo /*N*/ /*N*/ // And now check for Compression: /*N*/ if ( pPortion->GetLen() && GetAsianCompressionMode() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 bCompressedChars |= ImplCalcAsianCompression( pNode, pPortion, nTmpPos, (long*)pLine->GetCharPosArray().GetData() + (nTmpPos-pLine->GetStart()), 10000, FALSE ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 bCompressedChars |= ImplCalcAsianCompression( pNode, pPortion, nTmpPos, (long*)pLine->GetCharPosArray().GetData() + (nTmpPos-pLine->GetStart()), 10000, FALSE ); /*N*/ /*N*/ nTmpWidth += pPortion->GetSize().Width(); /*N*/ @@ -1242,7 +1242,7 @@ struct TabInfo /*N*/ if ( bCompressedChars && ( pPortion->GetLen() > 1 ) && pPortion->GetExtraInfos() && pPortion->GetExtraInfos()->bCompressed ) /*N*/ { /*?*/ // I need the manipulated DXArray for determining the break postion... -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImplCalcAsianCompression( pNode, pPortion, nPortionStart, (long*)pLine->GetCharPosArray().GetData() + (nPortionStart-pLine->GetStart()), 10000, TRUE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImplCalcAsianCompression( pNode, pPortion, nPortionStart, (long*)pLine->GetCharPosArray().GetData() + (nPortionStart-pLine->GetStart()), 10000, TRUE ); /*N*/ } /*N*/ ImpBreakLine( pParaPortion, pLine, pPortion, nPortionStart, /*N*/ nRemainingWidth, bCanHyphenate && bHyphenatePara ); @@ -1364,7 +1364,7 @@ struct TabInfo /*?*/ long nRemainingWidth = nMaxLineWidth - aTextSize.Width(); /*?*/ if ( nRemainingWidth > 0 ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImplExpandCompressedPortions( pLine, pParaPortion, nRemainingWidth ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImplExpandCompressedPortions( pLine, pParaPortion, nRemainingWidth ); //STRIP001 /*?*/ aTextSize = pLine->CalcTextSize( *pParaPortion ); /*?*/ } /*N*/ } @@ -2114,7 +2114,7 @@ struct TabInfo /*N*/ ( 0x629 == cCh || 0x62D == cCh || 0x62F == cCh || /*N*/ 0x627 == cCh || 0x644 == cCh || 0x643 == cCh ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT( 0 != cPrevCh, "No previous character" ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT( 0 != cPrevCh, "No previous character" ) //STRIP001 /*?*/ //STRIP001 /*?*/ // check if character is connectable to previous character, //STRIP001 /*?*/ if ( lcl_ConnectToPrev( cCh, cPrevCh ) ) @@ -2136,7 +2136,7 @@ struct TabInfo /*?*/ if ( 0x631 == cNextCh || 0x64A == cNextCh || /*?*/ 0x649 == cNextCh ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // check if character is connectable to previous character, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // check if character is connectable to previous character, //STRIP001 /*?*/ if ( lcl_ConnectToPrev( cCh, cPrevCh ) ) //STRIP001 /*?*/ nKashidaPos = aWordSel.Min().GetIndex() + nIdx - 1; /*?*/ } @@ -2147,7 +2147,7 @@ struct TabInfo /*N*/ if ( nIdx && nIdx + 1 == aWord.Len() && /*N*/ 0x60C <= cCh && 0x6FE >= cCh ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT( 0 != cPrevCh, "No previous character" ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DBG_ASSERT( 0 != cPrevCh, "No previous character" ) //STRIP001 /*?*/ //STRIP001 /*?*/ // check if character is connectable to previous character, //STRIP001 /*?*/ if ( lcl_ConnectToPrev( cCh, cPrevCh ) ) @@ -2226,7 +2226,7 @@ struct TabInfo /*N*/ if ( pTextPortion->GetExtraInfos() && pTextPortion->GetExtraInfos()->bCompressed ) /*N*/ { /*?*/ // We need the original size from the portion -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nTxtPortionStart = pPortion->GetTextPortions().GetStartPos( nSplitPortion ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nTxtPortionStart = pPortion->GetTextPortions().GetStartPos( nSplitPortion ); //STRIP001 /*?*/ SvxFont aTmpFont( pPortion->GetNode()->GetCharAttribs().GetDefFont() ); //STRIP001 /*?*/ SeekCursor( pPortion->GetNode(), nTxtPortionStart+1, aTmpFont ); //STRIP001 /*?*/ aTmpFont.SetPhysFont( GetRefDevice() ); @@ -2959,7 +2959,7 @@ struct TabInfo /*?*/ { /*?*/ const SvxFieldData* pFieldData = pFieldItem->GetField(); /*?*/ if( pFieldData ) -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 pMtf->AddAction( pFieldData->createBeginComment() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 pMtf->AddAction( pFieldData->createBeginComment() ); /*?*/ } /*?*/ } /*?*/ @@ -3005,7 +3005,7 @@ struct TabInfo /*N*/ short nEsc = aTmpFont.GetEscapement(); /*N*/ if ( nOrientation ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // Bei Hoch/Tief selbst Hand anlegen: +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Bei Hoch/Tief selbst Hand anlegen: //STRIP001 /*?*/ if ( aTmpFont.GetEscapement() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ long nDiff = aTmpFont.GetSize().Height() * aTmpFont.GetEscapement() / 100L; @@ -3054,7 +3054,7 @@ struct TabInfo /*?*/ } /*?*/ if ( bSpecialUnderline ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Size aSz = aTmpFont.GetPhysTxtSize( pOutDev, aText, nTextStart, nTextLen ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Size aSz = aTmpFont.GetPhysTxtSize( pOutDev, aText, nTextStart, nTextLen ); //STRIP001 /*?*/ BYTE nProp = aTmpFont.GetPropr(); //STRIP001 /*?*/ aTmpFont.SetEscapement( 0 ); //STRIP001 /*?*/ aTmpFont.SetPropr( 100 ); @@ -3063,7 +3063,7 @@ struct TabInfo //STRIP001 /*?*/ aBlanks.Fill( nTextLen, ' ' ); //STRIP001 /*?*/ Point aUnderlinePos( aOutPos ); //STRIP001 /*?*/ if ( nOrientation ) -//STRIP001 /*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 aUnderlinePos = lcl_ImplCalcRotatedPos( aTmpPos, aOrigin, nSin, nCos ); +//STRIP001 /*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aUnderlinePos = lcl_ImplCalcRotatedPos( aTmpPos, aOrigin, nSin, nCos ); //STRIP001 /*?*/ pOutDev->DrawStretchText( aUnderlinePos, aSz.Width(), aBlanks, 0, nTextLen ); //STRIP001 /*?*/ //STRIP001 /*?*/ aTmpFont.SetUnderline( UNDERLINE_NONE ); @@ -3087,7 +3087,7 @@ struct TabInfo /*?*/ Point aTopLeft( aTmpPos ); /*?*/ aTopLeft.Y() -= pLine->GetMaxAscent(); /*?*/ if ( nOrientation ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 aTopLeft = lcl_ImplCalcRotatedPos( aTopLeft, aOrigin, nSin, nCos ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aTopLeft = lcl_ImplCalcRotatedPos( aTopLeft, aOrigin, nSin, nCos ); /*?*/ Rectangle aRect( aTopLeft, pTextPortion->GetSize() ); /*?*/ pOutDev->DrawRect( aRect ); /*N*/ } @@ -3096,7 +3096,7 @@ struct TabInfo /*N*/ #ifndef SVX_LIGHT /*N*/ if ( GetStatus().DoOnlineSpelling() && GetStatus().DoDrawRedLines() && pPortion->GetNode()->GetWrongList()->HasWrongs() && pTextPortion->GetLen() ) /*N*/ { -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 /*?*/ {//#105750# adjust LinePos for superscript or subscript text +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 /*?*/ {//#105750# adjust LinePos for superscript or subscript text //STRIP001 /*?*/ short nEsc = aTmpFont.GetEscapement(); //STRIP001 /*?*/ if( nEsc ) //STRIP001 /*?*/ { @@ -3148,7 +3148,7 @@ struct TabInfo /*?*/ { /*?*/ const SvxFieldData* pFieldData = pFieldItem->GetField(); /*?*/ if( pFieldData ) -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 pMtf->AddAction( pFieldData->createEndComment() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 pMtf->AddAction( pFieldData->createEndComment() ); /*?*/ } /*?*/ } /*?*/ diff --git a/binfilter/bf_svx/source/editeng/svx_impedit4.cxx b/binfilter/bf_svx/source/editeng/svx_impedit4.cxx index a14ee08de..1b9678c89 100644 --- a/binfilter/bf_svx/source/editeng/svx_impedit4.cxx +++ b/binfilter/bf_svx/source/editeng/svx_impedit4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_impedit4.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1188,7 +1188,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ #ifndef SVX_LIGHT /*N*/ // ggf. Online-Spelling /*N*/ if ( bAllowBigObjects && bOnlyFullParagraphs && pNode->GetWrongList() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pC->SetWrongList( pNode->GetWrongList()->Clone() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pC->SetWrongList( pNode->GetWrongList()->Clone() ); /*N*/ #endif // !SVX_LIGHT /*N*/ /*N*/ } @@ -1222,7 +1222,7 @@ using namespace ::com::sun::star::linguistic2; /*?*/ nCount = pParaPortion->GetLines().Count(); /*?*/ for ( n = 0; n < nCount; n++ ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EditLine* pLine = pParaPortion->GetLines()[n]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EditLine* pLine = pParaPortion->GetLines()[n]; //STRIP001 /*?*/ EditLine* pNew = pLine->Clone(); //STRIP001 /*?*/ pX->aLines.Insert( pNew, pX->aLines.Count() ); /*?*/ } @@ -1390,7 +1390,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ if ( !bConvertItems ) /*N*/ SetParaAttribs( aEditDoc.GetPos( aPaM.GetNode() ), pC->GetParaAttribs() ); /*N*/ else -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SfxItemSet aAttribs( GetEmptyItemSet() ); //STRIP001 /*?*/ ConvertAndPutItems( aAttribs, pC->GetParaAttribs(), &eSourceUnit, &eDestUnit ); //STRIP001 /*?*/ SetParaAttribs( aEditDoc.GetPos( aPaM.GetNode() ), aAttribs ); @@ -1422,7 +1422,7 @@ using namespace ::com::sun::star::linguistic2; /*?*/ nCount = pXP->aLines.Count(); /*?*/ for ( sal_uInt16 m = 0; m < nCount; m++ ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EditLine* pLine = pXP->aLines[m]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EditLine* pLine = pXP->aLines[m]; //STRIP001 /*?*/ EditLine* pNew = pLine->Clone(); //STRIP001 /*?*/ pNew->SetInvalid(); // neu Painten! //STRIP001 /*?*/ pParaPortion->GetLines().Insert( pNew, m ); @@ -1446,7 +1446,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ /*N*/ #ifndef SVX_LIGHT /*N*/ if ( bNewContent && GetStatus().DoOnlineSpelling() && pC->GetWrongList() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 aPaM.GetNode()->SetWrongList( pC->GetWrongList()->Clone() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aPaM.GetNode()->SetWrongList( pC->GetWrongList()->Clone() ); /*N*/ #endif // !SVX_LIGHT /*N*/ /*N*/ // Zeilenumbruch, wenn weitere folgen... @@ -2254,7 +2254,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ { /*N*/ if ( b != bKernAsianPunctuation ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bKernAsianPunctuation = b; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bKernAsianPunctuation = b; //STRIP001 /*?*/ if ( ImplHasText() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ FormatFullDoc(); diff --git a/binfilter/bf_svx/source/editeng/svx_impedit5.cxx b/binfilter/bf_svx/source/editeng/svx_impedit5.cxx index ecafdba02..dd60dcf05 100644 --- a/binfilter/bf_svx/source/editeng/svx_impedit5.cxx +++ b/binfilter/bf_svx/source/editeng/svx_impedit5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_impedit5.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:11 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,7 @@ namespace binfilter { /*N*/ } /*N*/ void ImpEditEngine::SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 aSel.Adjust( aEditDoc ); //STRIP001 //STRIP001 USHORT nStartPara = aEditDoc.GetPos( aSel.Min().GetNode() ); @@ -329,7 +329,7 @@ namespace binfilter { /*N*/ DBG_ASSERT( !IsInUndo(), "InsertUndo im Undomodus!" ); /*N*/ if ( pUndoMarkSelection ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EditUndoMarkSelection* pU = new EditUndoMarkSelection( this, *pUndoMarkSelection ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EditUndoMarkSelection* pU = new EditUndoMarkSelection( this, *pUndoMarkSelection ); //STRIP001 /*?*/ GetUndoManager().AddUndoAction( pU, FALSE ); //STRIP001 /*?*/ delete pUndoMarkSelection; //STRIP001 /*?*/ pUndoMarkSelection = NULL; @@ -621,7 +621,7 @@ namespace binfilter { /*N*/ #ifndef SVX_LIGHT /*N*/ if ( IsUndoEnabled() && !IsInUndo() && aStatus.DoUndoAttribs() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 EditUndoSetAttribs* pUndo = CreateAttribUndo( aSel, rSet ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 EditUndoSetAttribs* pUndo = CreateAttribUndo( aSel, rSet ); //STRIP001 /*?*/ pUndo->SetSpecial( nSpecial ); //STRIP001 /*?*/ InsertUndo( pUndo ); /*N*/ } @@ -711,7 +711,7 @@ namespace binfilter { /*N*/ { /*N*/ pPortion->MarkSelectionInvalid( nStartPos, nEndPos-nStartPos ); /*N*/ if ( bCheckLanguage ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pNode->GetWrongList()->MarkInvalid( nStartPos, nEndPos ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pNode->GetWrongList()->MarkInvalid( nStartPos, nEndPos ); /*N*/ } /*N*/ } /*N*/ } @@ -964,7 +964,7 @@ namespace binfilter { /*N*/ ImplIMEInfos::ImplIMEInfos( const EditPaM& rPos, const String& rOldTextAfterStartPos ) /*N*/ : aOldTextAfterStartPos( rOldTextAfterStartPos ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 aPos = rPos; //STRIP001 nLen = 0; //STRIP001 bCursor = TRUE; @@ -973,7 +973,7 @@ namespace binfilter { /*N*/ } /*N*/ ImplIMEInfos::~ImplIMEInfos() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 delete[] pAttribs; /*N*/ } diff --git a/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx b/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx index 9b6c85573..c220b9c94 100644 --- a/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx +++ b/binfilter/bf_svx/source/editeng/svx_svxacorr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svxacorr.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1964,14 +1964,14 @@ void DecryptBlockName_Imp( String& rName ); //STRIP001 pCplStt_ExcptLst( 0 ), //STRIP001 pWrdStt_ExcptLst( 0 ), //STRIP001 pAutocorr_List( 0 ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ } /* -----------------18.11.98 11:16------------------- * * --------------------------------------------------*/ /*N*/ SvxAutoCorrectLanguageLists::~SvxAutoCorrectLanguageLists() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 delete pCplStt_ExcptLst; //STRIP001 delete pWrdStt_ExcptLst; //STRIP001 delete pAutocorr_List; diff --git a/binfilter/bf_svx/source/editeng/svx_txtrange.cxx b/binfilter/bf_svx/source/editeng/svx_txtrange.cxx index dc8b65ad7..c60e79025 100644 --- a/binfilter/bf_svx/source/editeng/svx_txtrange.cxx +++ b/binfilter/bf_svx/source/editeng/svx_txtrange.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_txtrange.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -314,13 +314,13 @@ namespace binfilter { /*N*/ long nYps; /*N*/ if( nLowDiff && ( ( nCut & 1 ) || nLast == 1 || nNext == 1 ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 nYps = CalcMax( rLst, rNxt, nBottom, nLower ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 nYps = CalcMax( rLst, rNxt, nBottom, nLower ); //STRIP001 /*?*/ if( nYps ) //STRIP001 /*?*/ _NoteFarPoint( Cut( nYps, rLst, rNxt ), nLower-nYps, nLowDiff ); /*N*/ } /*N*/ if( nUpDiff && ( ( nCut & 2 ) || nLast == 2 || nNext == 2 ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 nYps = CalcMax( rLst, rNxt, nTop, nUpper ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 nYps = CalcMax( rLst, rNxt, nTop, nUpper ); //STRIP001 /*?*/ if( nYps ) //STRIP001 /*?*/ _NoteFarPoint( Cut( nYps, rLst, rNxt ), nYps-nUpper, nUpDiff ); /*N*/ } @@ -420,7 +420,7 @@ namespace binfilter { /*N*/ // Der erste Punkt des Polygons liegt innerhalb der Zeile. /*N*/ if( nLast ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( bMultiple || !nAct ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( bMultiple || !nAct ) //STRIP001 /*?*/ { //STRIP001 /*?*/ nMin = USHRT_MAX; //STRIP001 /*?*/ nMax = 0; @@ -484,9 +484,9 @@ namespace binfilter { /*N*/ if( !nNext ) /*N*/ NotePoint( A(rNext) ); /*N*/ else if( nNext & 1 ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 NoteFarPoint( A(rNext), nLower-B(rNext), nLowDiff ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 NoteFarPoint( A(rNext), nLower-B(rNext), nLowDiff ); /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 NoteFarPoint( A(rNext), B(rNext)-nUpper, nUpDiff ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 NoteFarPoint( A(rNext), B(rNext)-nUpper, nUpDiff ); /*N*/ } /*N*/ nLast = nNext; /*N*/ if( ++nIdx == nCount && !IsClosed() ) diff --git a/binfilter/bf_svx/source/editeng/svx_unolingu.cxx b/binfilter/bf_svx/source/editeng/svx_unolingu.cxx index 42608bae7..4fecb637d 100644 --- a/binfilter/bf_svx/source/editeng/svx_unolingu.cxx +++ b/binfilter/bf_svx/source/editeng/svx_unolingu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_unolingu.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -466,7 +466,7 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE; /*N*/ uno::Sequence< lang::Locale > SAL_CALL /*N*/ ThesDummy_Impl::getLocales() /*N*/ throw(uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); uno::Sequence< lang::Locale > aa; return aa; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); uno::Sequence< lang::Locale > aa; return aa; //STRIP001 //STRIP001 if (SvxLinguConfigUpdate::IsUpdated()) //STRIP001 GetThes_Impl(); //STRIP001 if (xThes.is()) @@ -508,7 +508,7 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE; /*N*/ const beans::PropertyValues& rProperties ) /*N*/ throw(lang::IllegalArgumentException, /*N*/ uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); uno::Sequence< uno::Reference< linguistic2::XMeaning > > aRes;return aRes; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); uno::Sequence< uno::Reference< linguistic2::XMeaning > > aRes;return aRes; //STRIP001 //STRIP001 /*?*/ GetThes_Impl(); //STRIP001 /*?*/ uno::Sequence< uno::Reference< linguistic2::XMeaning > > aRes; //STRIP001 /*?*/ DBG_ASSERT( xThes.is(), "Thesaurus missing" ); @@ -557,7 +557,7 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE; /*N*/ void SpellDummy_Impl::GetSpell_Impl() -/*N*/ { DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ { DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // update configuration before accessing the service //STRIP001 if (!SvxLinguConfigUpdate::IsUpdated()) //STRIP001 SvxLinguConfigUpdate::UpdateAll(); @@ -574,7 +574,7 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE; /*N*/ uno::Sequence< sal_Int16 > SAL_CALL /*N*/ SpellDummy_Impl::getLanguages() /*N*/ throw(uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); return uno::Sequence< sal_Int16 >(); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Sequence< sal_Int16 >(); //STRIP001 //STRIP001 GetSpell_Impl(); //STRIP001 if (xSpell.is()) //STRIP001 return xSpell->getLanguages(); @@ -586,7 +586,7 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE; /*N*/ sal_Bool SAL_CALL /*N*/ SpellDummy_Impl::hasLanguage( sal_Int16 nLanguage ) /*N*/ throw(uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP");return FALSE; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE; //STRIP001 //STRIP001 GetSpell_Impl(); //STRIP001 BOOL bRes = FALSE; //STRIP001 if (xSpell.is()) @@ -614,7 +614,7 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE; /*N*/ const beans::PropertyValues& rProperties ) /*N*/ throw(lang::IllegalArgumentException, /*N*/ uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); uno::Reference< linguistic2::XSpellAlternatives > xRes; return xRes; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); uno::Reference< linguistic2::XSpellAlternatives > xRes; return xRes; //STRIP001 //STRIP001 GetSpell_Impl(); //STRIP001 uno::Reference< linguistic2::XSpellAlternatives > xRes; //STRIP001 if (xSpell.is()) @@ -693,7 +693,7 @@ BOOL SvxLinguConfigUpdate::bUpdated = FALSE; /*N*/ uno::Sequence< lang::Locale > SAL_CALL /*N*/ HyphDummy_Impl::getLocales() /*N*/ throw(uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); return uno::Sequence< lang::Locale >();//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Sequence< lang::Locale >();//STRIP001 //STRIP001 GetHyph_Impl(); //STRIP001 if (xHyph.is()) //STRIP001 return xHyph->getLocales(); diff --git a/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx b/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx index ca90e2315..d00731abc 100644 --- a/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_cube3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -432,7 +432,7 @@ namespace binfilter { /*N*/ } /*N*/ void E3dCubeObj::SetPosIsCenter(BOOL bNew) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(bPosIsCenter != bNew) //STRIP001 { //STRIP001 bPosIsCenter = bNew; diff --git a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx index 673817b63..14220f462 100644 --- a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_extrud3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -364,7 +364,7 @@ namespace binfilter { /*N*/ else /*N*/ { /*N*/ // call parent -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 E3dObject::CreateWireframe(rWirePoly, pTf, eDetail); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 E3dObject::CreateWireframe(rWirePoly, pTf, eDetail); /*N*/ } /*N*/ } diff --git a/binfilter/bf_svx/source/engine3d/svx_float3d.cxx b/binfilter/bf_svx/source/engine3d/svx_float3d.cxx index 1bc87e80a..33f55ee0c 100644 --- a/binfilter/bf_svx/source/engine3d/svx_float3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_float3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_float3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -3641,7 +3641,7 @@ namespace binfilter { /*N*/ SfxChildWinInfo* pInfo ) : /*N*/ SfxChildWindow( pParent, nId ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 Svx3DWin* pWin = new Svx3DWin( pBindings, this, pParent ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Svx3DWin* pWin = new Svx3DWin( pBindings, this, pParent ); //STRIP001 /*?*/ pWindow = pWin; //STRIP001 /*?*/ //STRIP001 /*?*/ eChildAlignment = SFX_ALIGN_NOALIGNMENT; diff --git a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx index 9514c74cd..6681ed149 100644 --- a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_lathe3d.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -520,7 +520,7 @@ namespace binfilter { /*N*/ else /*N*/ { /*N*/ // call parent -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 E3dObject::CreateWireframe(rWirePoly, pTf, eDetail); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 E3dObject::CreateWireframe(rWirePoly, pTf, eDetail); /*N*/ } /*N*/ } diff --git a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx index a6070b390..ea1df8ce2 100644 --- a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_obj3d.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2164,7 +2164,7 @@ namespace binfilter { /*N*/ { /*N*/ // Schatten beruecksichtigen /*N*/ if(DoDrawShadow()) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // ObjectTrans setzen //STRIP001 /*?*/ Matrix4D mTransform = GetFullTransform(); //STRIP001 /*?*/ pScene->GetCameraSet().SetObjectTrans(mTransform); diff --git a/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx b/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx index a591b20ac..28ff54f24 100644 --- a/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_poly3d.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2448,7 +2448,7 @@ namespace binfilter { /*N*/ if ( !bTruncated ) /*N*/ { /*N*/ if ( nAllPointCount > POLY3D_MAXPOINTS ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ UINT16 nDel = (UINT16)(nAllPointCount - POLY3D_MAXPOINTS); //STRIP001 /*?*/ UINT16 nPos = pPoly3D->GetPointCount() - nDel; //STRIP001 /*?*/ pPoly3D->Remove(nPos, nDel); diff --git a/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx index 1b6015f11..f25ec7cfc 100644 --- a/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_polygn3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -557,7 +557,7 @@ namespace binfilter { \************************************************************************/ /*N*/ void E3dPolygonObj::SetLineOnly(BOOL bNew) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(bNew != bLineOnly) //STRIP001 { //STRIP001 bLineOnly = bNew; diff --git a/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx index a98dd8f4f..7b1b51dc0 100644 --- a/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_polysc3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -209,7 +209,7 @@ namespace binfilter { /*N*/ FASTBOOL E3dPolyScene::Paint(ExtOutputDevice& rOut, /*N*/ const SdrPaintInfoRec& rInfoRec) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 FASTBOOL bOk=TRUE; //STRIP001 if(GetSubList() && GetSubList()->GetObjCount()) //STRIP001 { diff --git a/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx b/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx index ea71a27df..d756750e4 100644 --- a/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_sphere3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -785,7 +785,7 @@ namespace binfilter { \************************************************************************/ /*N*/ void E3dSphereObj::SetCenter(const Vector3D& rNew) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(aCenter != rNew) //STRIP001 { //STRIP001 aCenter = rNew; @@ -794,7 +794,7 @@ namespace binfilter { /*N*/ } /*N*/ void E3dSphereObj::SetSize(const Vector3D& rNew) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(aSize != rNew) //STRIP001 { //STRIP001 aSize = rNew; diff --git a/binfilter/bf_svx/source/engine3d/svx_view3d.cxx b/binfilter/bf_svx/source/engine3d/svx_view3d.cxx index 16d9775df..6ba7fbc0f 100644 --- a/binfilter/bf_svx/source/engine3d/svx_view3d.cxx +++ b/binfilter/bf_svx/source/engine3d/svx_view3d.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_view3d.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -770,7 +770,7 @@ long DistPoint2Line (Point u, /*?*/ SdrObject *pObj = aMark.GetMark(a)->GetObj(); /*?*/ if(pObj) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImpIsConvertTo3DPossible(pObj, bAny3D, bGroupSelected); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImpIsConvertTo3DPossible(pObj, bAny3D, bGroupSelected); /*?*/ } /*N*/ } /*N*/ diff --git a/binfilter/bf_svx/source/form/svx_ParseContext.cxx b/binfilter/bf_svx/source/form/svx_ParseContext.cxx index 413f31866..04c5bf9cd 100644 --- a/binfilter/bf_svx/source/form/svx_ParseContext.cxx +++ b/binfilter/bf_svx/source/form/svx_ParseContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_ParseContext.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,13 +102,13 @@ using namespace ::connectivity; //----------------------------------------------------------------------------- /*?*/ ::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const -/*?*/ {DBG_ASSERT(0, "STRIP"); ::com::sun::star::lang::Locale alocal; return alocal;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); ::com::sun::star::lang::Locale alocal; return alocal;//STRIP001 /*?*/ //STRIP001 return SvtSysLocale().GetLocaleData().getLocale(); /*?*/ } //----------------------------------------------------------------------------- /*?*/ ::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const -/*?*/ {DBG_ASSERT(0, "STRIP"); String astring; return astring;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); String astring; return astring;//STRIP001 //STRIP001 String aMsg; //STRIP001 vos::OGuard aGuard( Application::GetSolarMutex() ); //STRIP001 switch (_eCode) @@ -130,7 +130,7 @@ using namespace ::connectivity; //----------------------------------------------------------------------------- /*?*/ ::rtl::OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const -/*?*/ {DBG_ASSERT(0, "STRIP"); ByteString aKeyword; return aKeyword;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); ByteString aKeyword; return aKeyword;//STRIP001 //STRIP001 ByteString aKeyword; //STRIP001 switch (_eKey) //STRIP001 { @@ -176,7 +176,7 @@ using namespace ::connectivity; //STRIP001 } // ----------------------------------------------------------------------------- /*?*/ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString& rToken) const -/*?*/ {DBG_ASSERT(0, "STRIP"); IParseContext::InternationalKeyCode aInternationalKeyCode; return aInternationalKeyCode;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); IParseContext::InternationalKeyCode aInternationalKeyCode; return aInternationalKeyCode;//STRIP001 //STRIP001 static IParseContext::InternationalKeyCode Intl_TokenID[] = //STRIP001 { //STRIP001 KEY_LIKE, KEY_NOT, KEY_NULL, KEY_TRUE, @@ -244,7 +244,7 @@ namespace /*N*/ } // ----------------------------------------------------------------------------- /*N*/ const OSystemParseContext* OParseContextClient::getParseContext() const -/*N*/ { DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ { DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 return getSharedContext(); /*N*/ } // ----------------------------------------------------------------------------- diff --git a/binfilter/bf_svx/source/form/svx_fmdpage.cxx b/binfilter/bf_svx/source/form/svx_fmdpage.cxx index 41835a3d0..655f85c89 100644 --- a/binfilter/bf_svx/source/form/svx_fmdpage.cxx +++ b/binfilter/bf_svx/source/form/svx_fmdpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_fmdpage.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:58 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ namespace binfilter { /*N*/ } /*N*/ ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(::com::sun::star::uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); ::com::sun::star::uno::Sequence< sal_Int8 > a; return a; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); ::com::sun::star::uno::Sequence< sal_Int8 > a; return a; //STRIP001 //STRIP001 return ::binfilter::form::OImplementationIds::getImplementationId(getTypes()); //STRIP008 return ::form::OImplementationIds::getImplementationId(getTypes()); /*N*/ } diff --git a/binfilter/bf_svx/source/form/svx_fmmodel.cxx b/binfilter/bf_svx/source/form/svx_fmmodel.cxx index 868276486..72f35740f 100644 --- a/binfilter/bf_svx/source/form/svx_fmmodel.cxx +++ b/binfilter/bf_svx/source/form/svx_fmmodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_fmmodel.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -374,7 +374,7 @@ struct FmFormModelImplData |* \************************************************************************/ /*?*/ void FmFormModel::MovePage( USHORT nPgNum, USHORT nNewPos ) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 #ifndef SVX_LIGHT //STRIP001 m_pImpl->bMovingPage = sal_True; //STRIP001 // see InsertPage for this diff --git a/binfilter/bf_svx/source/form/svx_fmobj.cxx b/binfilter/bf_svx/source/form/svx_fmobj.cxx index 05ef0c116..c67d884ef 100644 --- a/binfilter/bf_svx/source/form/svx_fmobj.cxx +++ b/binfilter/bf_svx/source/form/svx_fmobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_fmobj.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:58 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -210,7 +210,7 @@ using namespace ::binfilter::svxform;//STRIP008 using namespace ::svxform; /*N*/ if (m_xEnvironmentHistory.is()) /*N*/ { /*N*/ // the element in *m_pEnvironmentHistory which is equivalent to my new parent (which (perhaps) has to be created within _pNewPage->GetForms) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*N*/ // is the right-most element in the tree. +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ // is the right-most element in the tree. //STRIP001 /*?*/ ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > xLoop = m_xEnvironmentHistory; //STRIP001 /*?*/ do //STRIP001 /*?*/ { @@ -251,7 +251,7 @@ using namespace ::binfilter::svxform;//STRIP008 using namespace ::svxform; /*?*/ } /*?*/ if (xSearch.is()) // implies xSearch == xOldForms, which means we're a valid part of our current page forms hierarchy /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xMeAsChild(GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xMeAsChild(GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY); //STRIP001 /*?*/ xNewParent = ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > (ensureModelEnv(xMeAsChild->getParent(), ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > (pNewFormPage->GetForms(), ::com::sun::star::uno::UNO_QUERY)), ::com::sun::star::uno::UNO_QUERY); //STRIP001 /*?*/ //STRIP001 /*?*/ if (xNewParent.is()) diff --git a/binfilter/bf_svx/source/form/svx_fmobjfac.cxx b/binfilter/bf_svx/source/form/svx_fmobjfac.cxx index 966fede59..00491c0bc 100644 --- a/binfilter/bf_svx/source/form/svx_fmobjfac.cxx +++ b/binfilter/bf_svx/source/form/svx_fmobjfac.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_fmobjfac.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:43:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -305,7 +305,7 @@ using namespace ::binfilter::svxform;//STRIP008 using namespace ::svxform; //STRIP001 /*?*/ pObjFactory->pNewObj = new FmFormObj(FM_COMPONENT_FORMATTEDFIELD,pObjFactory->nIdentifier); //STRIP001 /*?*/ } break; /*?*/ default: -/*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 return 0; +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 return 0; /*?*/ } /*?*/ } /*N*/ diff --git a/binfilter/bf_svx/source/form/svx_fmtools.cxx b/binfilter/bf_svx/source/form/svx_fmtools.cxx index c0d4fb118..87f6a6c9a 100644 --- a/binfilter/bf_svx/source/form/svx_fmtools.cxx +++ b/binfilter/bf_svx/source/form/svx_fmtools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_fmtools.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:23:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1185,7 +1185,7 @@ using namespace ::connectivity::simple; //------------------------------------------------------------------------------ /*N*/ Sequence< sal_Int8 > SAL_CALL FmXDispatchInterceptorImpl::getImplementationId() throw(RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); Sequence< sal_Int8 > a; return a;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); Sequence< sal_Int8 > a; return a;//STRIP001 //STRIP001 return ::binfilter::form::OImplementationIds::getImplementationId(getTypes());//STRIP008 return ::form::OImplementationIds::getImplementationId(getTypes()); /*N*/ } //------------------------------------------------------------------------------ @@ -1208,7 +1208,7 @@ using namespace ::connectivity::simple; /*?*/ Sequence< Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL /*?*/ FmXDispatchInterceptorImpl::queryDispatches( const Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); Sequence< Reference< ::com::sun::star::frame::XDispatch> > aReturn(aDescripts.getLength()); return aReturn;//STRIP001 ::osl::MutexGuard aGuard(getAccessSafety()); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); Sequence< Reference< ::com::sun::star::frame::XDispatch> > aReturn(aDescripts.getLength()); return aReturn;//STRIP001 ::osl::MutexGuard aGuard(getAccessSafety()); //STRIP001 Sequence< Reference< ::com::sun::star::frame::XDispatch> > aReturn(aDescripts.getLength()); //STRIP001 Reference< ::com::sun::star::frame::XDispatch>* pReturn = aReturn.getArray(); //STRIP001 const ::com::sun::star::frame::DispatchDescriptor* pDescripts = aDescripts.getConstArray(); @@ -1256,7 +1256,7 @@ using namespace ::connectivity::simple; //------------------------------------------------------------------------------ /*?*/ void SAL_CALL FmXDispatchInterceptorImpl::disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (m_bListening) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (m_bListening) //STRIP001 { //STRIP001 Reference< XDispatchProviderInterception > xIntercepted(m_xIntercepted.get(), UNO_QUERY); //STRIP001 if (Source.Source == xIntercepted) diff --git a/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx b/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx index 55dcf5f83..8a58f5c7b 100644 --- a/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx +++ b/binfilter/bf_svx/source/inc/AccessibleStringWrap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleStringWrap.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:44:20 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,10 +87,10 @@ class AccessibleStringWrap { public: - AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText ){DBG_ASSERT(0, "STRIP");}//STRIP001 AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText ); + AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText ){DBG_BF_ASSERT(0, "STRIP");}//STRIP001 AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const String& rText ); - sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ){DBG_ASSERT(0, "STRIP"); return false;}//STRIP001 sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ); - sal_Int32 GetIndexAtPoint( const Point& rPoint ){DBG_ASSERT(0, "STRIP"); return 0;}//STRIP001 sal_Int32 GetIndexAtPoint( const Point& rPoint ); + sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ){DBG_BF_ASSERT(0, "STRIP"); return false;}//STRIP001 sal_Bool GetCharacterBounds( sal_Int32 nIndex, Rectangle& rRect ); + sal_Int32 GetIndexAtPoint( const Point& rPoint ){DBG_BF_ASSERT(0, "STRIP"); return 0;}//STRIP001 sal_Int32 GetIndexAtPoint( const Point& rPoint ); private: diff --git a/binfilter/bf_svx/source/items/svx_algitem.cxx b/binfilter/bf_svx/source/items/svx_algitem.cxx index 1e520e03a..666a4942b 100644 --- a/binfilter/bf_svx/source/items/svx_algitem.cxx +++ b/binfilter/bf_svx/source/items/svx_algitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_algitem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:45:03 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -292,7 +292,7 @@ using namespace ::com::sun::star; /*?*/ USHORT SvxHorJustifyItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_HOR_JUSTIFY_REPEAT + 1; // letzter Enum-Wert + 1 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_HOR_JUSTIFY_REPEAT + 1; // letzter Enum-Wert + 1 /*?*/ } // class SvxVerJustifyItem ----------------------------------------------- @@ -394,7 +394,7 @@ using namespace ::com::sun::star; /*?*/ USHORT SvxVerJustifyItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_VER_JUSTIFY_BOTTOM + 1; // letzter Enum-Wert + 1 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_VER_JUSTIFY_BOTTOM + 1; // letzter Enum-Wert + 1 /*?*/ } // class SvxOrientationItem ---------------------------------------------- @@ -494,7 +494,7 @@ using namespace ::com::sun::star; /*?*/ USHORT SvxOrientationItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1 /*?*/ } // class SvxMarginItem --------------------------------------------------- diff --git a/binfilter/bf_svx/source/items/svx_drawitem.cxx b/binfilter/bf_svx/source/items/svx_drawitem.cxx index 2cf6c7d47..643caad82 100644 --- a/binfilter/bf_svx/source/items/svx_drawitem.cxx +++ b/binfilter/bf_svx/source/items/svx_drawitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_drawitem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:45:06 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ namespace binfilter { /*?*/ int SvxColorTableItem::operator==( const SfxPoolItem& rItem ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); //STRIP001 return ( ( SvxColorTableItem& ) rItem).pColorTable == pColorTable; /*?*/ } @@ -184,7 +184,7 @@ namespace binfilter { /*?*/ int SvxGradientListItem::operator==( const SfxPoolItem& rItem ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); //STRIP001 return ( ( SvxGradientListItem& ) rItem).pGradientList == pGradientList; /*?*/ } @@ -239,7 +239,7 @@ namespace binfilter { /*?*/ int SvxHatchListItem::operator==( const SfxPoolItem& rItem ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); //STRIP001 return ( ( SvxHatchListItem& ) rItem).pHatchList == pHatchList; /*?*/ } @@ -294,7 +294,7 @@ namespace binfilter { /*?*/ int SvxBitmapListItem::operator==( const SfxPoolItem& rItem ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); //STRIP001 return ( ( SvxBitmapListItem& ) rItem).pBitmapList == pBitmapList; /*?*/ } @@ -350,7 +350,7 @@ namespace binfilter { /*?*/ int SvxDashListItem::operator==( const SfxPoolItem& rItem ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" ); //STRIP001 return ( ( SvxDashListItem& ) rItem).pDashList == pDashList; /*?*/ } diff --git a/binfilter/bf_svx/source/items/svx_e3ditem.cxx b/binfilter/bf_svx/source/items/svx_e3ditem.cxx index 0a3f2b831..feb7e635e 100644 --- a/binfilter/bf_svx/source/items/svx_e3ditem.cxx +++ b/binfilter/bf_svx/source/items/svx_e3ditem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_e3ditem.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:24:06 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ using namespace ::com::sun::star; /*?*/ SvxVector3DItem::SvxVector3DItem() /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ DBG_CTOR(SvxVector3DItem, 0); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ DBG_CTOR(SvxVector3DItem, 0); /*?*/ } // ----------------------------------------------------------------------- diff --git a/binfilter/bf_svx/source/items/svx_flditem.cxx b/binfilter/bf_svx/source/items/svx_flditem.cxx index eb6bc5ac4..28f529912 100644 --- a/binfilter/bf_svx/source/items/svx_flditem.cxx +++ b/binfilter/bf_svx/source/items/svx_flditem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_flditem.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: cl $ $Date: 2004-04-02 07:48:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,12 +143,12 @@ namespace binfilter { /*?*/ MetaAction* SvxFieldData::createBeginComment() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); /*?*/ } /*?*/ MetaAction* SvxFieldData::createEndComment() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP");return NULL;//STRIP001 return new MetaCommentAction( "FIELD_SEQ_END" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP");return NULL;//STRIP001 return new MetaCommentAction( "FIELD_SEQ_END" ); /*?*/ } // ----------------------------------------------------------------------- diff --git a/binfilter/bf_svx/source/items/svx_frmitems.cxx b/binfilter/bf_svx/source/items/svx_frmitems.cxx index 7ca57af54..0c88de31d 100644 --- a/binfilter/bf_svx/source/items/svx_frmitems.cxx +++ b/binfilter/bf_svx/source/items/svx_frmitems.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_frmitems.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:45:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1629,7 +1629,7 @@ using namespace ::com::sun::star; /*?*/ sal_uInt16 SvxShadowItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_SHADOW_END; // SVX_SHADOW_BOTTOMRIGHT + 1 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_SHADOW_END; // SVX_SHADOW_BOTTOMRIGHT + 1 /*?*/ } // ----------------------------------------------------------------------- @@ -1644,14 +1644,14 @@ using namespace ::com::sun::star; /*?*/ sal_uInt16 SvxShadowItem::GetEnumValue() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return GetLocation(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return GetLocation(); /*?*/ } // ----------------------------------------------------------------------- /*?*/ void SvxShadowItem::SetEnumValue( sal_uInt16 nVal ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SetLocation( (const SvxShadowLocation)nVal ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetLocation( (const SvxShadowLocation)nVal ); /*?*/ } // class SvxBorderLine -------------------------------------------------- @@ -1826,7 +1826,7 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- /*N*/ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return *this;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return *this;//STRIP001 //STRIP001 nTopDist = rBox.nTopDist; //STRIP001 nBottomDist = rBox.nBottomDist; //STRIP001 nLeftDist = rBox.nLeftDist; @@ -3048,7 +3048,7 @@ using namespace ::com::sun::star; /*?*/ sal_uInt16 SvxFmtBreakItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_BREAK_END; // SVX_BREAK_PAGE_BOTH + 1 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_BREAK_END; // SVX_BREAK_PAGE_BOTH + 1 /*?*/ } // class SvxFmtKeepItem ------------------------------------------------- @@ -3147,7 +3147,7 @@ using namespace ::com::sun::star; /*?*/ int SvxLineItem::operator==( const SfxPoolItem& rAttr ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); /*?*/ //STRIP001 return CmpBrdLn( pLine, ((SvxLineItem&)rAttr).GetLine() ); /*?*/ } @@ -3156,7 +3156,7 @@ using namespace ::com::sun::star; /*?*/ SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SvxLineItem( *this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SvxLineItem( *this ); /*?*/ } //STRIP001 sal_Bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const @@ -3286,7 +3286,7 @@ using namespace ::com::sun::star; // ----------------------------------------------------------------------- /*N*/ void SvxLineItem::SetLine( const SvxBorderLine* pNew ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 delete pLine; //STRIP001 pLine = pNew ? new SvxBorderLine( *pNew ) : 0; /*N*/ } @@ -3330,7 +3330,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink /*?*/ Graphic SvxBrushItemLink_Impl::GetGraphic( const String& rLink, const String& rFilter) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); Graphic aResult; return aResult;//STRIP001 Graphic aResult; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); Graphic aResult; return aResult;//STRIP001 Graphic aResult; //STRIP001 SvxBrushItem aItem( rLink, rFilter, GPOS_TILED ); //STRIP001 const Graphic* pGraph = aItem.GetGraphic(); //STRIP001 if( pGraph ) @@ -3342,7 +3342,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink /*?*/ CreateSvxBrushTabPage SvxBrushItemLink_Impl::GetBackgroundTabpageCreateFunc() /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 #ifndef SVX_LIGHT +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 #ifndef SVX_LIGHT //STRIP001 return (CreateSvxBrushTabPage)SvxBackgroundTabPage::Create; //STRIP001 #else //STRIP001 return CreateSvxBrushTabPage(); @@ -3353,7 +3353,7 @@ class SvxBrushItemLink_Impl : public SfxBrushItemLink /*?*/ GetSvxBrushTabPageRanges SvxBrushItemLink_Impl::GetBackgroundTabpageRanges() /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 #ifndef SVX_LIGHT +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 #ifndef SVX_LIGHT //STRIP001 return (GetSvxBrushTabPageRanges)SvxBackgroundTabPage::GetRanges; //STRIP001 #else //STRIP001 return GetSvxBrushTabPageRanges(); @@ -4060,7 +4060,7 @@ GraphicFilter* GetGrfFilter(); /*?*/ // asynchrone Fall was die Benachrichtigung angeht unterschiedlich /*?*/ // behandelt. Der Callback erfolgt nur bei asynchronem Eintreffen /*?*/ // der Daten -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ //STRIP001 /*?*/ Link aTmp = pImpl->aDoneLink; //STRIP001 /*?*/ pImpl->aDoneLink = Link(); //STRIP001 /*?*/ pImpl->xMedium->DownLoad( @@ -4069,7 +4069,7 @@ GraphicFilter* GetGrfFilter(); /*?*/ } /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pImpl->xMedium->DownLoad( ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pImpl->xMedium->DownLoad( ); //STRIP001 /*?*/ DoneHdl_Impl( (SvxBrushItem*)this, 0 ); /*?*/ } /*N*/ } @@ -4110,7 +4110,7 @@ GraphicFilter* GetGrfFilter(); // ----------------------------------------------------------------------- /*N*/ void SvxBrushItem::SetGraphic( const Graphic& rNew ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !pStrLink ) //STRIP001 { //STRIP001 if ( pImpl->pGraphicObject ) @@ -4233,7 +4233,7 @@ GraphicFilter* GetGrfFilter(); /*N*/ bLoadAgain( sal_True ), /*N*/ pStrLink(0), /*N*/ pStrFilter(0) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 aColor = rItem.GetColor(); //STRIP001 //STRIP001 if( rItem.GetBitmapURL().Len() ) diff --git a/binfilter/bf_svx/source/items/svx_hlnkitem.cxx b/binfilter/bf_svx/source/items/svx_hlnkitem.cxx index d8ed33ca8..12c8a125d 100644 --- a/binfilter/bf_svx/source/items/svx_hlnkitem.cxx +++ b/binfilter/bf_svx/source/items/svx_hlnkitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_hlnkitem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:45:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -299,7 +299,7 @@ namespace binfilter { /*?*/ SfxPoolItem* SvxHyperlinkItem::Clone( SfxItemPool* ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SvxHyperlinkItem( *this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SvxHyperlinkItem( *this ); /*?*/ } /*-------------------------------------------------------------------- @@ -308,7 +308,7 @@ namespace binfilter { /*?*/ int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" ); //STRIP001 //STRIP001 const SvxHyperlinkItem& rItem = (const SvxHyperlinkItem&) rAttr; //STRIP001 diff --git a/binfilter/bf_svx/source/items/svx_numitem.cxx b/binfilter/bf_svx/source/items/svx_numitem.cxx index 250e56866..f07055989 100644 --- a/binfilter/bf_svx/source/items/svx_numitem.cxx +++ b/binfilter/bf_svx/source/items/svx_numitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_numitem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:45:11 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -433,7 +433,7 @@ sal_Int32 SvxNumberType::nRefCount = 0; /*N*/ DELETEZ(pGraphicBrush); /*N*/ if(rFormat.pGraphicBrush) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pGraphicBrush = new SvxBrushItem(*rFormat.pGraphicBrush); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pGraphicBrush = new SvxBrushItem(*rFormat.pGraphicBrush); //STRIP001 /*?*/ pGraphicBrush->SetDoneLink( STATIC_LINK( this, SvxNumberFormat, GraphicArrived) ); /*N*/ } /*N*/ DELETEZ(pBulletFont); @@ -488,7 +488,7 @@ sal_Int32 SvxNumberType::nRefCount = 0; /*N*/ } /*N*/ else if(!pGraphicBrush || pGraphicBrush && !(*pBrushItem == *pGraphicBrush)) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ delete pGraphicBrush; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ delete pGraphicBrush; //STRIP001 /*?*/ pGraphicBrush = (SvxBrushItem*)pBrushItem->Clone(); //STRIP001 /*?*/ pGraphicBrush->SetDoneLink( STATIC_LINK( this, SvxNumberFormat, GraphicArrived) ); /*N*/ } @@ -996,7 +996,7 @@ static SvxNumberFormat* pStdOutlineNumFmt = 0; /*N*/ pLinkStr->Len() && /*N*/ 0 !=(pGraphic = pBrush->GetGraphic())) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SvxBrushItem aTempItem(*pBrush); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SvxBrushItem aTempItem(*pBrush); //STRIP001 /*?*/ aTempItem.SetGraphicLink( String()); //STRIP001 /*?*/ aTempItem.SetGraphic(*pGraphic); //STRIP001 /*?*/ SvxFrameVertOrient eOrient = aFmt.GetVertOrient(); diff --git a/binfilter/bf_svx/source/items/svx_paraitem.cxx b/binfilter/bf_svx/source/items/svx_paraitem.cxx index f59bc0770..e7a9fabbd 100644 --- a/binfilter/bf_svx/source/items/svx_paraitem.cxx +++ b/binfilter/bf_svx/source/items/svx_paraitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_paraitem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:45:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -386,14 +386,14 @@ using namespace ::com::sun::star; /*?*/ sal_uInt16 SvxLineSpacingItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return SVX_LINESPACE_END;//STRIP001 /*?*/ return SVX_LINESPACE_END; // SVX_LINESPACE_TWO_LINES + 1 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return SVX_LINESPACE_END;//STRIP001 /*?*/ return SVX_LINESPACE_END; // SVX_LINESPACE_TWO_LINES + 1 /*?*/ } // ----------------------------------------------------------------------- /*?*/ XubString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); XubString aText;//STRIP001 //STRIP001 //! Strings demnaechst aus Resource laden +/*?*/ DBG_BF_ASSERT(0, "STRIP"); XubString aText;//STRIP001 //STRIP001 //! Strings demnaechst aus Resource laden //STRIP001 XubString aText; //STRIP001 switch ( nPos ) //STRIP001 { @@ -409,7 +409,7 @@ using namespace ::com::sun::star; /*?*/ sal_uInt16 SvxLineSpacingItem::GetEnumValue() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 sal_uInt16 nVal; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 sal_uInt16 nVal; //STRIP001 switch ( nPropLineSpace ) //STRIP001 { //STRIP001 case 100: nVal = SVX_LINESPACE_ONE_LINE; break; @@ -424,7 +424,7 @@ using namespace ::com::sun::star; /*?*/ void SvxLineSpacingItem::SetEnumValue( sal_uInt16 nVal ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 switch ( nVal ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 switch ( nVal ) //STRIP001 { //STRIP001 case SVX_LINESPACE_ONE_LINE: nPropLineSpace = 100; break; //STRIP001 case SVX_LINESPACE_ONE_POINT_FIVE_LINES: nPropLineSpace = 150; break; @@ -548,7 +548,7 @@ using namespace ::com::sun::star; /*?*/ sal_uInt16 SvxAdjustItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_ADJUST_END; // SVX_ADJUST_BLOCKLINE + 1 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_ADJUST_END; // SVX_ADJUST_BLOCKLINE + 1 /*?*/ } // ----------------------------------------------------------------------- @@ -563,13 +563,13 @@ using namespace ::com::sun::star; /*?*/ sal_uInt16 SvxAdjustItem::GetEnumValue() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return GetAdjust(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return GetAdjust(); /*?*/ } // ----------------------------------------------------------------------- /*N*/ void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetAdjust( (const SvxAdjust)nVal ); /*N*/ } @@ -1738,12 +1738,12 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence; /*N*/ } /*N*/ SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool *pPool ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 return new SvxParaGridItem( GetValue(), Which() ); /*N*/ } /*N*/ SfxPoolItem* SvxParaGridItem::Create(SvStream & rStrm, USHORT) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 sal_Bool bFlag; //STRIP001 rStrm >> bFlag; //STRIP001 return new SvxParaGridItem( bFlag, Which() ); diff --git a/binfilter/bf_svx/source/items/svx_svxfont.cxx b/binfilter/bf_svx/source/items/svx_svxfont.cxx index a8fd30ecb..c027b3e43 100644 --- a/binfilter/bf_svx/source/items/svx_svxfont.cxx +++ b/binfilter/bf_svx/source/items/svx_svxfont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svxfont.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -616,14 +616,14 @@ public: /*?*/ /*?*/ if( IsCapital() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ DBG_ASSERT( !pDXArray, "DrawCapital nicht fuer TextArray!" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ DBG_ASSERT( !pDXArray, "DrawCapital nicht fuer TextArray!" ); //STRIP001 /*?*/ DrawCapital( pOut, aPos, rTxt, nIdx, nLen ); /*?*/ } /*?*/ else /*?*/ { /*?*/ if ( IsKern() && !pDXArray ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ Size aSize = GetPhysTxtSize( pOut, rTxt, nIdx, nLen ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ Size aSize = GetPhysTxtSize( pOut, rTxt, nIdx, nLen ); //STRIP001 /*?*/ //STRIP001 /*?*/ if ( !IsCaseMap() ) //STRIP001 /*?*/ pOut->DrawStretchText( aPos, aSize.Width(), rTxt, nIdx, nLen ); diff --git a/binfilter/bf_svx/source/items/svx_textitem.cxx b/binfilter/bf_svx/source/items/svx_textitem.cxx index cf1ea7bf2..b739a3e4a 100644 --- a/binfilter/bf_svx/source/items/svx_textitem.cxx +++ b/binfilter/bf_svx/source/items/svx_textitem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_textitem.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -321,7 +321,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE; /*?*/ int SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); //STRIP001 //STRIP001 return( pFontList == ((SvxFontListItem&)rAttr).pFontList ); /*?*/ } @@ -583,7 +583,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE; /*?*/ USHORT SvxPostureItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 /*?*/ return ITALIC_NORMAL + 1; // auch ITALIC_NONE geh"ort dazu +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 /*?*/ return ITALIC_NORMAL + 1; // auch ITALIC_NONE geh"ort dazu /*?*/ } // ----------------------------------------------------------------------- @@ -750,7 +750,7 @@ BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE; /*?*/ USHORT SvxWeightItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return WEIGHT_BLACK; // WEIGHT_DONTKNOW geh"ort nicht dazu +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return WEIGHT_BLACK; // WEIGHT_DONTKNOW geh"ort nicht dazu /*?*/ } // ----------------------------------------------------------------------- @@ -2241,7 +2241,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI /*?*/ USHORT SvxCaseMapItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1 /*?*/ } // ----------------------------------------------------------------------- @@ -2418,7 +2418,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI /*?*/ USHORT SvxEscapementItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_ESCAPEMENT_END; // SVX_ESCAPEMENT_SUBSCRIPT + 1 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return SVX_ESCAPEMENT_END; // SVX_ESCAPEMENT_SUBSCRIPT + 1 /*?*/ } //------------------------------------------------------------------------ @@ -2466,7 +2466,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI /*?*/ USHORT SvxEscapementItem::GetEnumValue() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if ( nEsc < 0 ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if ( nEsc < 0 ) //STRIP001 return SVX_ESCAPEMENT_SUBSCRIPT; //STRIP001 else if ( nEsc > 0 ) //STRIP001 return SVX_ESCAPEMENT_SUPERSCRIPT; @@ -2477,7 +2477,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI /*?*/ void SvxEscapementItem::SetEnumValue( USHORT nVal ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SetEscapement( (const SvxEscapement)nVal ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetEscapement( (const SvxEscapement)nVal ); /*?*/ } /*-----------------13.03.98 17:05------------------- @@ -2560,7 +2560,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI /*?*/ USHORT SvxLanguageItem::GetValueCount() const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return LANGUAGE_COUNT; // aus tlintl.hxx +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return LANGUAGE_COUNT; // aus tlintl.hxx /*?*/ } // ----------------------------------------------------------------------- @@ -3042,7 +3042,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI /*?*/ int SvxTwoLinesItem::operator==( const SfxPoolItem& rAttr ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "not equal attribute types" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "not equal attribute types" ); //STRIP001 return bOn == ((SvxTwoLinesItem&)rAttr).bOn && //STRIP001 cStartBracket == ((SvxTwoLinesItem&)rAttr).cStartBracket && //STRIP001 cEndBracket == ((SvxTwoLinesItem&)rAttr).cEndBracket; @@ -3050,7 +3050,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI /*?*/ SfxPoolItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SvxTwoLinesItem( *this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SvxTwoLinesItem( *this ); /*?*/ } //STRIP001 sal_Bool SvxTwoLinesItem::QueryValue( ::com::sun::star::uno::Any& rVal, @@ -3554,7 +3554,7 @@ nHeight = nNewHeight + ::binfilter::ItemToControl( (short)nNewProp, eUnit,//STRI /*N*/ } /*N*/ SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool *pPool ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 /*N*/ SvxScriptSetItem* p = new SvxScriptSetItem( Which(), *GetItemSet().GetPool() ); //STRIP001 /*N*/ p->GetItemSet().Put( GetItemSet(), FALSE ); //STRIP001 /*N*/ return p; diff --git a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx index 9f0cf8b0a..1172c766a 100644 --- a/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx +++ b/binfilter/bf_svx/source/items/svx_xmlcnitm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xmlcnitm.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-12-05 15:10:53 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -142,7 +142,7 @@ using namespace ::com::sun::star::xml; /*N*/ return TRUE; /*N*/ } /*N*/ BOOL SvXMLAttrContainerItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 Reference<XInterface> xRef; //STRIP001 SvUnoAttributeContainer* pContainer = NULL; //STRIP001 @@ -269,23 +269,23 @@ using namespace ::com::sun::star::xml; /*N*/ USHORT SvXMLAttrContainerItem::GetFirstNamespaceIndex() const -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 return pImpl->GetFirstNamespaceIndex(); /*N*/ } /*N*/ USHORT SvXMLAttrContainerItem::GetNextNamespaceIndex( USHORT nIdx ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 return pImpl->GetNextNamespaceIndex( nIdx ); /*N*/ } /*N*/ const OUString& SvXMLAttrContainerItem::GetNamespace( USHORT i ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return OUString::createFromAscii (""); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return OUString::createFromAscii (""); //STRIP001 //STRIP001 return pImpl->GetNamespace( i ); /*N*/ } /*N*/ const OUString& SvXMLAttrContainerItem::GetPrefix( USHORT i ) const /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); return ::rtl::OUString::createFromAscii ("");//STRIP001 /*N*/ return pImpl->GetPrefix( i ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return ::rtl::OUString::createFromAscii ("");//STRIP001 /*N*/ return pImpl->GetPrefix( i ); /*N*/ } diff --git a/binfilter/bf_svx/source/outliner/svx_outlin2.cxx b/binfilter/bf_svx/source/outliner/svx_outlin2.cxx index dec28bade..82b49c914 100644 --- a/binfilter/bf_svx/source/outliner/svx_outlin2.cxx +++ b/binfilter/bf_svx/source/outliner/svx_outlin2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_outlin2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:24:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -187,7 +187,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ pEditEngine->aOutlinerNotifyHdl = rLink; /*N*/ /*N*/ if ( rLink.IsSet() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pEditEngine->SetNotifyHdl( LINK( this, Outliner, EditEngineNotifyHdl ) ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pEditEngine->SetNotifyHdl( LINK( this, Outliner, EditEngineNotifyHdl ) ); /*N*/ else /*N*/ pEditEngine->SetNotifyHdl( Link() ); /*N*/ @@ -388,7 +388,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ } /*N*/ BOOL Outliner::IsInSelectionMode() const -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 //STRIP001 DBG_CHKTHIS(Outliner,0); //STRIP001 return pEditEngine->IsInSelectionMode(); /*N*/ } diff --git a/binfilter/bf_svx/source/outliner/svx_outliner.cxx b/binfilter/bf_svx/source/outliner/svx_outliner.cxx index d7349bc8c..9ad6d6f3f 100644 --- a/binfilter/bf_svx/source/outliner/svx_outliner.cxx +++ b/binfilter/bf_svx/source/outliner/svx_outliner.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_outliner.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:44 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -180,7 +180,7 @@ namespace binfilter { /*N*/ } /*N*/ Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, USHORT nDepth) -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 DBG_CHKTHIS(Outliner,0); //STRIP001 DBG_ASSERT(pParaList->GetParagraphCount(),"Insert:No Paras"); //STRIP001 @@ -237,7 +237,7 @@ namespace binfilter { /*N*/ /*N*/ if( bPasting || pEditEngine->IsInUndo() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Paragraph* pPara = new Paragraph( 0xffff ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Paragraph* pPara = new Paragraph( 0xffff ); //STRIP001 /*?*/ pParaList->Insert( pPara, nPara ); //STRIP001 /*?*/ if( pEditEngine->IsInUndo() ) //STRIP001 /*?*/ { @@ -876,7 +876,7 @@ namespace binfilter { /*N*/ #ifndef SVX_LIGHT /*N*/ if ( bUndo ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 InsertUndo( new OutlinerUndoChangeDepth( this, nPara, nOldDepth, nDepth ) ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 InsertUndo( new OutlinerUndoChangeDepth( this, nPara, nOldDepth, nDepth ) ); //STRIP001 /*?*/ if ( bUndoAction ) //STRIP001 /*?*/ UndoActionEnd( OLUNDO_DEPTH ); /*N*/ } @@ -1008,7 +1008,7 @@ namespace binfilter { /*N*/ } /*N*/ else /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP");//STRIP001 aStdFont = pEditEngine->GetStandardFont( nPara ); +/*?*/ DBG_BF_ASSERT(0, "STRIP");//STRIP001 aStdFont = pEditEngine->GetStandardFont( nPara ); /*N*/ } /*N*/ /*N*/ Font aBulletFont; @@ -1057,7 +1057,7 @@ namespace binfilter { /*N*/ /*N*/ if ( ImplHasBullet( nPara ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bVertical = IsVertical(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bVertical = IsVertical(); //STRIP001 /*?*/ //STRIP001 /*?*/ BOOL bRightToLeftPara = pEditEngine->IsRightToLeft( nPara ); //STRIP001 /*?*/ @@ -1291,7 +1291,7 @@ namespace binfilter { //STRIP001 } /*N*/ ULONG Outliner::Read( SvStream& rInput, USHORT eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 //STRIP001 DBG_CHKTHIS(Outliner,0); //STRIP001 //STRIP001 BOOL bOldUndo = pEditEngine->IsUndoEnabled(); @@ -1877,13 +1877,13 @@ namespace binfilter { /*N*/ nBulletWidth = aBulletSize.Width(); /*N*/ /*N*/ if ( bAdjust && !bOutlineMode ) -/*N*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*N*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 /*?*/ // Bei zentriert/rechtsbuendig anpassen //STRIP001 /*?*/ const SvxAdjustItem& rItem = (const SvxAdjustItem&)pEditEngine->GetParaAttrib( nPara, EE_PARA_JUST ); //STRIP001 /*?*/ if ( ( !pEditEngine->IsRightToLeft( nPara ) && ( rItem.GetAdjust() != SVX_ADJUST_LEFT ) ) || //STRIP001 /*?*/ ( pEditEngine->IsRightToLeft( nPara ) && ( rItem.GetAdjust() != SVX_ADJUST_RIGHT ) ) ) //STRIP001 /*?*/ { -//STRIP001 /*?*/ {DBG_ASSERT(0, "STRIP");}//STRIP001 aTopLeft.X() = pEditEngine->GetFirstLineStartX( nPara ) - nBulletWidth; +//STRIP001 /*?*/ {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 aTopLeft.X() = pEditEngine->GetFirstLineStartX( nPara ) - nBulletWidth; //STRIP001 /*?*/ } /*N*/ } /*N*/ @@ -1930,7 +1930,7 @@ namespace binfilter { /*N*/ } /*N*/ if ( bReturnPaperPos ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Size aBulletSize( aBulletArea.GetSize() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Size aBulletSize( aBulletArea.GetSize() ); //STRIP001 /*?*/ Point aBulletDocPos( aBulletArea.TopLeft() ); //STRIP001 /*?*/ aBulletDocPos.Y() += pEditEngine->GetDocPosTopLeft( nPara ).Y(); //STRIP001 /*?*/ Point aBulletPos( aBulletDocPos ); @@ -2072,7 +2072,7 @@ namespace binfilter { /*N*/ } /*N*/ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS(Outliner,0); //STRIP001 //STRIP001 ULONG nPara = pParaList->GetAbsPos( pPara ); @@ -2082,7 +2082,7 @@ namespace binfilter { /*N*/ } /*N*/ IMPL_LINK( Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo*, pInfos ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS(Outliner,0); //STRIP001 //STRIP001 GetBeginMovingHdl().Call( this ); @@ -2091,7 +2091,7 @@ namespace binfilter { /*N*/ } /*N*/ IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 BOOL bCheckStyles = ( ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT ) || ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEVIEW ) ); //STRIP001 if ( bCheckStyles ) //STRIP001 { @@ -2112,7 +2112,7 @@ namespace binfilter { /*N*/ } /*N*/ IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pInfos->nAction == EE_ACTION_PASTE ) //STRIP001 { //STRIP001 bPasting = FALSE; @@ -2185,7 +2185,7 @@ namespace binfilter { /*N*/ } /*N*/ IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, pInfos ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS(Outliner,0); //STRIP001 //STRIP001 pParaList->MoveParagraphs( pInfos->nStartPara, pInfos->nDestPara, pInfos->nEndPara - pInfos->nStartPara + 1 ); @@ -2229,7 +2229,7 @@ namespace binfilter { /*N*/ else if( pFmt->GetNumberingType() != SVX_NUM_NUMBER_NONE ) /*N*/ { /*?*/ if ( nRelPos == 0xFFFF ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pParaList->GetParent( pPara, nRelPos ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pParaList->GetParent( pPara, nRelPos ); /*?*/ USHORT nNumber = nRelPos + pFmt->GetStart(); /*?*/ aBulletText += pFmt->GetNumStr( nNumber ); /*N*/ } @@ -2342,7 +2342,7 @@ namespace binfilter { /*N*/ IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify*, pNotify ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !bBlockInsCallback ) //STRIP001 { //STRIP001 pEditEngine->aOutlinerNotifyHdl.Call( pNotify ); diff --git a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx index f6203824d..bf9d16903 100644 --- a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx +++ b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_outlobj.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:24:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,7 +151,7 @@ namespace binfilter { /*N*/ } /*N*/ void OutlinerParaObject::SetStyleSheets( USHORT nLevel, const XubString rNewName, const SfxStyleFamily& rNewFamily ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for ( USHORT n = Count(); n; ) //STRIP001 { //STRIP001 if ( GetDepth( --n ) == nLevel ) diff --git a/binfilter/bf_svx/source/outliner/svx_outlvw.cxx b/binfilter/bf_svx/source/outliner/svx_outlvw.cxx index 8d9fc3ec5..74b74217e 100644 --- a/binfilter/bf_svx/source/outliner/svx_outlvw.cxx +++ b/binfilter/bf_svx/source/outliner/svx_outlvw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_outlvw.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:24:09 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1037,14 +1037,14 @@ namespace binfilter { /*N*/ void OutlinerView::Cut() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS(OutlinerView,0); //STRIP001 if ( !ImpCalcSelectedPages( FALSE ) || pOwner->ImpCanDeleteSelectedPages( this ) ) //STRIP001 pEditView->Cut(); /*N*/ } /*N*/ void OutlinerView::Paste() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS(OutlinerView,0); //STRIP001 PasteSpecial(); // HACK(SD ruft nicht PasteSpecial auf) /*N*/ } @@ -1090,7 +1090,7 @@ namespace binfilter { //STRIP001 } /*N*/ void OutlinerView::SetStyleSheet( SfxStyleSheet* pStyle ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS(OutlinerView,0); //STRIP001 pEditView->SetStyleSheet( pStyle ); //STRIP001 @@ -1348,7 +1348,7 @@ namespace binfilter { /*N*/ XubString OutlinerView::GetSelected() const -/*N*/ {DBG_ASSERT(0, "STRIP"); return XubString(); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return XubString(); //STRIP001 //STRIP001 DBG_CHKTHIS(OutlinerView,0); //STRIP001 return pEditView->GetSelected(); /*N*/ } @@ -1472,7 +1472,7 @@ namespace binfilter { /*N*/ void OutlinerView::Copy() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DBG_CHKTHIS(OutlinerView,0); //STRIP001 pEditView->Copy(); /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx b/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx index 92662c16e..fd6529de0 100644 --- a/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_impgrfll.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ namespace binfilter { /*N*/ GDIMetaFile* pMtf=NULL; /*N*/ if( eFillStyle != XFILL_NONE && /*N*/ (pMtf=mrXOut.GetOutDev()->GetConnectMetaFile()) ) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 /*?*/ XPolyPolygon aGeometry; //STRIP001 /*?*/ mrObj.TakeXorPoly(aGeometry, TRUE); //STRIP001 /*?*/ diff --git a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx index 4d4d0c6d7..3becf227d 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdattr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1779,7 +1779,7 @@ using namespace ::com::sun::star; /*N*/ USHORT __EXPORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; } /*N*/ XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const -/*N*/ {DBG_ASSERT(0, "STRIP");XubString a; return a; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");XubString a; return a; //STRIP001 //STRIP001 return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos); /*N*/ } @@ -2021,7 +2021,7 @@ using namespace ::com::sun::star; /*N*/ sal_uInt32 i, nCount; /*N*/ rIn >> nCount; /*N*/ for ( i = 0; i < nCount; i++ ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ rIn >> aVal.nValue; //STRIP001 /*?*/ SetValue( i, aVal ); /*N*/ } @@ -2045,7 +2045,7 @@ using namespace ::com::sun::star; /*N*/ { /*N*/ sal_uInt32 i; /*N*/ for ( i = 0; i < GetCount(); i++ ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if ( ((SdrAutoShapeAdjustmentItem&)rCmp).GetValue( i ).nValue != GetValue( i ).nValue ) //STRIP001 /*?*/ { //STRIP001 /*?*/ bRet = 0; @@ -2091,7 +2091,7 @@ using namespace ::com::sun::star; /*N*/ sal_uInt32 i, nCount = GetCount(); /*N*/ rOut << nCount; /*N*/ for ( i = 0; i < nCount; i++ ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 rOut << GetValue( i ).nValue; +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 rOut << GetValue( i ).nValue; /*N*/ } /*N*/ return rOut; /*N*/ } @@ -2101,7 +2101,7 @@ using namespace ::com::sun::star; /*N*/ sal_uInt32 i; /*N*/ SdrAutoShapeAdjustmentItem* pItem = new SdrAutoShapeAdjustmentItem; /*N*/ for ( i = 0; i < GetCount(); i++ ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const SdrAutoShapeAdjustmentValue& rVal = GetValue( i ); //STRIP001 /*?*/ pItem->SetValue( i, rVal ); /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx index 109c7e78e..831d01924 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdcrtv.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,7 +148,7 @@ namespace binfilter { /*N*/ void ImpSdrConnectMarker::SetTargetObject(const SdrObject* pObj) /*N*/ { -/*N*/ if (pAktObj!=pObj) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pAktObj!=pObj) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ BOOL bVisible=IsVisible(); //STRIP001 /*?*/ if (bVisible) Hide(); //STRIP001 /*?*/ pAktObj=pObj; @@ -272,7 +272,7 @@ namespace binfilter { /*N*/ void SdrCreateView::ToggleShownXor(OutputDevice* pOut, const Region* pRegion) const /*N*/ { /*N*/ SdrDragView::ToggleShownXor(pOut,pRegion); -/*N*/ if (pAktCreate!=NULL && aDragStat.IsShown()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pAktCreate!=NULL && aDragStat.IsShown()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ DrawCreateObj(pOut,TRUE); /*N*/ } /*N*/ } @@ -288,7 +288,7 @@ namespace binfilter { /*?*/ if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return FALSE; /*N*/ } /*N*/ if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE || pCurrentLibObj!=NULL) { -/*?*/ if (pConnectMarker->IsVisible()) {DBG_ASSERT(0, "STRIP"); }//STRIP001 pConnectMarker->Hide(); +/*?*/ if (pConnectMarker->IsVisible()) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pConnectMarker->Hide(); /*N*/ pConnectMarker->SetTargetObject(NULL); /*N*/ return FALSE; /*N*/ } else { @@ -865,7 +865,7 @@ namespace binfilter { /*N*/ void SdrCreateView::BrkCreateObj() /*N*/ { -/*N*/ if (pAktCreate!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pAktCreate!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if (pLibObjDragMeth==NULL) { //STRIP001 /*?*/ if (!IsSolidDraggingNow()) { //STRIP001 /*?*/ HideCreateObj(pDragWin,TRUE); @@ -1111,7 +1111,7 @@ namespace binfilter { //STRIP001 } /*N*/ BOOL SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 if (pAktCreate!=NULL) { //STRIP001 pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); //STRIP001 return TRUE; diff --git a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx index f4d9fd53a..b4c03e6bf 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svddrgv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svddrgv.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-12-03 10:42:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -229,7 +229,7 @@ namespace binfilter { /*N*/ SdrExchangeView::ToggleShownXor(pOut,pRegion); if (pDragBla!=NULL && aDragStat.IsShown() && 1 )//STRIP001 //STRIP001 (!IS_TYPE(SdrDragMovHdl,pDragBla)) { // das ist ein Hack !!!!!!!!!! -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 DrawDragObj(pOut,TRUE); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 DrawDragObj(pOut,TRUE); //STRIP001 /*?*/ } /*N*/ } @@ -881,7 +881,7 @@ namespace binfilter { /*N*/ void SdrDragView::BrkDragObj() /*N*/ { -/*N*/ if (pDragBla!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pDragBla!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pDragBla->Brk(); //STRIP001 /*?*/ delete pDragBla; //STRIP001 /*?*/ pDragBla=NULL; @@ -1050,19 +1050,19 @@ namespace binfilter { /*N*/ if (IsNoDragXorPolys()!=bOn) { /*N*/ BOOL bDragging=pDragBla!=NULL; /*N*/ BOOL bShown=bDragging && aDragStat.IsShown(); -/*N*/ if (bShown) {DBG_ASSERT(0, "STRIP");} //STRIP001 HideDragObj(pDragWin); +/*N*/ if (bShown) {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 HideDragObj(pDragWin); /*N*/ bNoDragXorPolys=bOn; -/*N*/ if (bDragging) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bDragging) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SetDragPolys(FALSE,IS_TYPE(SdrDragCrook,pDragBla)); //STRIP001 /*?*/ pDragBla->MovAllPoints(); // die gedraggten Polys neu berechnen /*N*/ } -/*N*/ if (bShown) {DBG_ASSERT(0, "STRIP"); }//STRIP001 ShowDragObj(pDragWin); +/*N*/ if (bShown) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ShowDragObj(pDragWin); /*N*/ } /*N*/ } /*N*/ void SdrDragView::SetDragStripes(BOOL bOn) /*N*/ { -/*N*/ if (pDragBla!=NULL && aDragStat.IsShown()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pDragBla!=NULL && aDragStat.IsShown()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ HideDragObj(pDragWin); //STRIP001 /*?*/ bDragStripes=bOn; //STRIP001 /*?*/ ShowDragObj(pDragWin); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdedtv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdedtv.cxx index e94e1f714..859bfb704 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdedtv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdedtv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdedtv.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:09 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -250,7 +250,7 @@ namespace binfilter {//STRIP009 //STRIP001 } /*N*/ void SdrEditView::DeleteLayer(const XubString& rName) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SdrLayerAdmin& rLA = pMod->GetLayerAdmin(); //STRIP001 SdrLayer* pLayer = rLA.GetLayer(rName, TRUE); //STRIP001 sal_uInt16 nLayerNum(rLA.GetLayerPos(pLayer)); @@ -517,7 +517,7 @@ namespace binfilter {//STRIP009 /*N*/ ImpResetPossibilityFlags(); /*N*/ aMark.ForceSort(); /*N*/ ULONG nMarkAnz=aMark.GetMarkCount(); -/*N*/ if (nMarkAnz!=0) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (nMarkAnz!=0) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ bReverseOrderPossible=nMarkAnz>=2; //STRIP001 /*?*/ //STRIP001 /*?*/ ULONG nMovableCount=0; @@ -578,7 +578,7 @@ namespace binfilter {//STRIP009 //STRIP001 /*?*/ const SdrMark* pM=aMark.GetMark(nm); //STRIP001 /*?*/ const SdrObject* pObj=pM->GetObj(); //STRIP001 /*?*/ const SdrPageView* pPV=pM->GetPageView(); -//STRIP001 /*?*/ if (pPV!=pPV0) {DBG_ASSERT(0, "STRIP"); //STRIP001 +//STRIP001 /*?*/ if (pPV!=pPV0) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 //STRIP001 /*?*/ if (pPV->IsReadOnly()) bReadOnly=TRUE; //STRIP001 //STRIP001 /*?*/ pPV0=pPV; //STRIP001 /*?*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx b/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx index 7ff9af0c9..9b91a0a8d 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdedtv2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:10 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -488,7 +488,7 @@ namespace binfilter { /*N*/ { /*N*/ ULONG nAnz=aMark.GetMarkCount(); /*N*/ if (nAnz==0) return; -/*?*/ if (nAnz==1) { DBG_ASSERT(0, "STRIP"); //STRIP001 // Sonderbehandlung fuer Einzelmarkierung +/*?*/ if (nAnz==1) { DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Sonderbehandlung fuer Einzelmarkierung //STRIP001 /*?*/ SdrObject* pObj=aMark.GetMark(0)->GetObj(); //STRIP001 /*?*/ SdrObjList* pOL=pObj->GetObjList(); //STRIP001 /*?*/ ULONG nMax=pOL->GetObjCount(); @@ -506,7 +506,7 @@ namespace binfilter { //STRIP001 /*?*/ } //STRIP001 /*?*/ bToTopPossible=nObjNum<ULONG(nMax-1); //STRIP001 /*?*/ bToBtmPossible=nObjNum>nMin; -/*N*/ } else {DBG_ASSERT(0, "STRIP"); //STRIP001 // Mehrfachselektion +/*N*/ } else {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Mehrfachselektion //STRIP001 /*?*/ ULONG nm=0; //STRIP001 /*?*/ SdrObjList* pOL0=NULL; //STRIP001 /*?*/ long nPos0=-1; @@ -1109,7 +1109,7 @@ namespace binfilter { //STRIP001 } /*N*/ BOOL SdrEditView::CombineMarkedObjects(BOOL bNoPolyPoly) -/*N*/ {{DBG_ASSERT(0, "STRIP"); } return false;//STRIP001 +/*N*/ {{DBG_BF_ASSERT(0, "STRIP"); } return false;//STRIP001 //STRIP001 // #105899# Start of Combine-Undo put to front, else ConvertMarkedToPolyObj would //STRIP001 // create a 2nd Undo-action and Undo-Comment. //STRIP001 @@ -1357,7 +1357,7 @@ namespace binfilter { //STRIP001 } /*N*/ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 UINT32 nCnt(0); //STRIP001 // Temporaere Marklist //STRIP001 SdrMarkList aRemoveMerker; @@ -1412,7 +1412,7 @@ namespace binfilter { //////////////////////////////////////////////////////////////////////////////////////////////////// /*N*/ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (HasMarkedObj()) { //STRIP001 BegUndo(ImpGetResStr(STR_EditGroup),aMark.GetMarkDescription(),SDRREPFUNC_OBJ_GROUP); //STRIP001 aMark.ForceSort(); @@ -1503,7 +1503,7 @@ namespace binfilter { //////////////////////////////////////////////////////////////////////////////////////////////////// /*N*/ void SdrEditView::UnGroupMarked() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SdrMarkList aNewMark; //STRIP001 //STRIP001 BegUndo(String(), String(), SDRREPFUNC_OBJ_UNGROUP); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx index 00ced9d1b..0c54f7c29 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdedxv.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:45 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -173,7 +173,7 @@ namespace binfilter { /*N*/ SdrObjEditView::~SdrObjEditView() /*N*/ { /*N*/ pTextEditWin = NULL; // Damit es in EndTextEdit kein ShowCursor gibt -/*N*/ if (IsTextEdit()){DBG_ASSERT(0, "STRIP"); }//STRIP001 EndTextEdit(); +/*N*/ if (IsTextEdit()){DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 EndTextEdit(); /*N*/ if (pTextEditOutliner!=NULL) { /*?*/ delete pTextEditOutliner; /*N*/ } @@ -236,7 +236,7 @@ namespace binfilter { /*?*/ // ... /*?*/ } /*?*/ if (eKind==HINT_MODELSAVED) { // #43095# -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pTextEditOutliner->ClearModifyFlag(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pTextEditOutliner->ClearModifyFlag(); /*?*/ } /*N*/ } /*N*/ } @@ -244,9 +244,9 @@ namespace binfilter { /*N*/ void SdrObjEditView::ModelHasChanged() /*N*/ { /*N*/ SdrGlueEditView::ModelHasChanged(); -/*N*/ if (IsTextEdit() && !pTextEditObj->IsInserted()) {DBG_ASSERT(0, "STRIP"); }//STRIP001 EndTextEdit(); // Objekt geloescht +/*N*/ if (IsTextEdit() && !pTextEditObj->IsInserted()) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 EndTextEdit(); // Objekt geloescht /*N*/ // TextEditObj geaendert? -/*N*/ if (IsTextEdit()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (IsTextEdit()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pTextEditObj); //STRIP001 /*?*/ if (pTextObj!=NULL) { //STRIP001 /*?*/ ULONG nOutlViewAnz=pTextEditOutliner->GetViewCount(); @@ -570,14 +570,14 @@ namespace binfilter { /*N*/ BOOL SdrObjEditView::BegTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, /*N*/ SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView, /*N*/ BOOL bDontDeleteOutliner, BOOL bOnlyOneView) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 return BegTextEdit(pObj,pPV,pWin,FALSE,pGivenOutliner,pGivenOutlinerView,bDontDeleteOutliner,bOnlyOneView); /*N*/ } /*N*/ BOOL SdrObjEditView::BegTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, BOOL bIsNewObj, /*N*/ SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView, /*N*/ BOOL bDontDeleteOutliner, BOOL bOnlyOneView) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 EndTextEdit(); //STRIP001 if (!HAS_BASE(SdrTextObj,pObj)) return FALSE; // z.Zt. nur mit meinen Textobjekten //STRIP001 bTextEditDontDelete=bDontDeleteOutliner && pGivenOutliner!=NULL; @@ -754,7 +754,7 @@ namespace binfilter { /*N*/ } /*N*/ SdrEndTextEditKind SdrObjEditView::EndTextEdit(BOOL bDontDeleteReally) -/*N*/ {DBG_ASSERT(0, "STRIP");SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED; return eRet; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED; return eRet; //STRIP001 //STRIP001 SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED; //STRIP001 SdrObject* pTEObj =pTextEditObj; //STRIP001 SdrPageView* pTEPV =pTextEditPV; @@ -941,7 +941,7 @@ namespace binfilter { /*?*/ nTol=nTol/3; /*?*/ nTol=0; // Joe am 6.3.1997: Keine Hittoleranz mehr hier /*?*/ if (!bOk) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Rectangle aEditArea; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Rectangle aEditArea; //STRIP001 /*?*/ OutlinerView* pOLV=pTextEditOutliner->GetView(0); //STRIP001 /*?*/ if (pOLV!=NULL) { //STRIP001 /*?*/ aEditArea.Union(pOLV->GetOutputArea()); @@ -969,7 +969,7 @@ namespace binfilter { /*N*/ { /*N*/ BOOL bOk=FALSE; /*N*/ if (pTextEditObj!=NULL) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextEditObj); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextEditObj); //STRIP001 /*?*/ OutlinerView* pOLV=pTextEditOutliner->GetView(0); //STRIP001 /*?*/ if( pOLV ) //STRIP001 /*?*/ { @@ -1491,7 +1491,7 @@ namespace binfilter { //STRIP001 } /*N*/ BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 // if we are currently in edit mode we must also set the stylesheet //STRIP001 // on all paragraphs in the Outliner for the edit view //STRIP001 // #92191# @@ -1557,7 +1557,7 @@ namespace binfilter { /*N*/ { /*N*/ SdrGlueEditView::DelWin(pWin1); /*N*/ if (pTextEditObj!=NULL && !bTextEditOnlyOneView && pWin1->GetOutDevType()==OUTDEV_WINDOW) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 for (ULONG i=pTextEditOutliner->GetViewCount(); i>0;) { +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 for (ULONG i=pTextEditOutliner->GetViewCount(); i>0;) { //STRIP001 /*?*/ i--; //STRIP001 /*?*/ OutlinerView* pOLV=pTextEditOutliner->GetView(i); //STRIP001 /*?*/ if (pOLV && pOLV->GetWindow()==(Window*)pWin1) { @@ -1667,7 +1667,7 @@ namespace binfilter { /*N*/ void SdrObjEditView::BrkMacroObj() /*N*/ { -/*N*/ if (pMacroObj!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pMacroObj!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ImpMacroUp(aMacroDownPos); //STRIP001 /*?*/ pMacroObj=NULL; //STRIP001 /*?*/ pMacroPV=NULL; diff --git a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx index 61b32ac39..23cc6a781 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdhdl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:45 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -303,7 +303,7 @@ namespace binfilter { //STRIP001 nPPntNum(0), //STRIP001 bPlusHdl(FALSE), //STRIP001 nSourceHdlNum(0) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(!pSimpleSet) //STRIP001 pSimpleSet = new SdrHdlBitmapSet(SIP_SA_MARKERS); //STRIP001 DBG_ASSERT(pSimpleSet, "Could not construct SdrHdlBitmapSet()!"); @@ -332,7 +332,7 @@ namespace binfilter { //STRIP001 nPPntNum(0), //STRIP001 bPlusHdl(FALSE), //STRIP001 nSourceHdlNum(0) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(!pSimpleSet) //STRIP001 pSimpleSet = new SdrHdlBitmapSet(SIP_SA_MARKERS); //STRIP001 DBG_ASSERT(pSimpleSet, "Could not construct SdrHdlBitmapSet()!"); @@ -348,7 +348,7 @@ namespace binfilter { /*N*/ } /*N*/ SdrHdl::~SdrHdl() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 GetRidOfIAObject(); /*N*/ } @@ -1474,7 +1474,7 @@ namespace binfilter { /*N*/ }; /*N*/ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 SdrHdlKind eKind1=((SdrHdl*)pElem1)->GetKind(); //STRIP001 SdrHdlKind eKind2=((SdrHdl*)pElem2)->GetKind(); //STRIP001 // Level 1: Erst normale Handles, dann Glue, dann User, dann Plushandles, dann Retpunkt-Handles @@ -1805,7 +1805,7 @@ struct ImplHdlAndIndex /*N*/ pImpl->mnFocusIndex = CONTAINER_ENTRY_NOTFOUND; /*N*/ /*N*/ if(pHdl) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pHdl->Touch(); //STRIP001 /*?*/ //STRIP001 /*?*/ if(pImpl->pView) @@ -1886,7 +1886,7 @@ struct ImplHdlAndIndex /*N*/ /*N*/ // propagate change to IAOs /*N*/ for(UINT32 i=0; i<GetHdlCount(); i++) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrHdl* pHdl = GetHdl(i); //STRIP001 /*?*/ pHdl->Touch(); /*N*/ } @@ -1903,7 +1903,7 @@ struct ImplHdlAndIndex /*N*/ void SdrHdlList::Clear() /*N*/ { /*N*/ for (ULONG i=0; i<GetHdlCount(); i++) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrHdl* pHdl=GetHdl(i); //STRIP001 /*?*/ delete pHdl; /*N*/ } @@ -1929,7 +1929,7 @@ struct ImplHdlAndIndex /*N*/ SdrHdl* pNow = GetFocusHdl(); /*N*/ /*N*/ if(pPrev != pNow) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ sal_Bool bRefresh(sal_False); //STRIP001 /*?*/ //STRIP001 /*?*/ if(pPrev) @@ -1976,7 +1976,7 @@ struct ImplHdlAndIndex /*N*/ SdrHdl* pRet=NULL; /*N*/ ULONG nAnz=GetHdlCount(); /*N*/ ULONG nNum=bBack ? 0 : nAnz; -/*N*/ while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if (!bBack) nNum--; //STRIP001 /*?*/ SdrHdl* pHdl=GetHdl(nNum); //STRIP001 /*?*/ if (bNext) { diff --git a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx index 35fd8b56a..af9004586 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdlayer.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-20 04:58:55 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -263,7 +263,7 @@ namespace binfilter { /*N*/ rIn >> rLayer.nType; /*N*/ /*N*/ if(rLayer.nType == 1) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ rLayer.aName = ImpGetResStr(STR_StandardLayerName); /*N*/ } /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx index 8c68ac97e..537d3fd20 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdmark.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:15 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -234,7 +234,7 @@ namespace binfilter { /*N*/ if (!bSorted) { /*N*/ bSorted=TRUE; /*N*/ ULONG nAnz=aList.Count(); -/*N*/ if (nAnz>1) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (nAnz>1) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ImpSdrMarkListSorter aSort(aList); //STRIP001 /*?*/ aSort.DoSort(); //STRIP001 /*?*/ // und nun doppelte rauswerfen @@ -342,7 +342,7 @@ namespace binfilter { /*N*/ } /*N*/ void SdrMarkList::InsertEntry(const SdrMark& rMark, FASTBOOL bChkSort) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetNameDirty(); //STRIP001 ULONG nAnz=aList.Count(); //STRIP001 if (!bChkSort || !bSorted || nAnz==0) { diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx index aab1e4b8a..c4c479607 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdmodel.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:54 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -822,7 +822,7 @@ using namespace ::com::sun::star; //STRIP001 } /*N*/ void SdrModel::AddUndo(SdrUndoAction* pUndo) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (pAktUndoGroup!=NULL) { //STRIP001 pAktUndoGroup->AddAction(pUndo); //STRIP001 } else { @@ -872,7 +872,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ SdrModel* SdrModel::AllocModel() const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ SdrModel* pModel=new SdrModel; //STRIP001 pModel->SetScaleUnit(eObjUnit,aObjUnit); /*N*/ return pModel; @@ -1635,7 +1635,7 @@ using namespace ::com::sun::star; /*N*/ pPage->SetInserted(TRUE); /*N*/ pPage->SetPageNum(nPos); /*N*/ pPage->SetModel(this); -/*N*/ if (nPos<nAnz) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (nPos<nAnz) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ bMPgNumsDirty=TRUE; //STRIP001 /*?*/ // Anpassen der MasterPageDescriptoren //STRIP001 /*?*/ USHORT nPageAnz=GetPageCount(); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx index c59dc7e14..643352c14 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdmrkv.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-12-03 10:42:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -313,7 +313,7 @@ namespace binfilter { /*N*/ { /*N*/ SdrSnapView::ToggleShownXor(pOut,pRegion); /*N*/ if ((bMarking || bMarkingPoints || bMarkingGluePoints) && aDragStat.IsShown()) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DrawMarkObjOrPoints(pOut); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DrawMarkObjOrPoints(pOut); /*N*/ } // if (bHdlShown) { // DrawMarkHdl(pOut,FALSE); @@ -435,7 +435,7 @@ namespace binfilter { /*N*/ void SdrMarkView::BrkMarkObj() /*N*/ { -/*N*/ if (bMarking) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bMarking) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ HideMarkObjOrPoints(pDragWin); //STRIP001 /*?*/ bMarking=FALSE; //STRIP001 /*?*/ bUnmarking=FALSE; @@ -495,7 +495,7 @@ namespace binfilter { /*N*/ void SdrMarkView::BrkMarkPoints() /*N*/ { -/*N*/ if (bMarkingPoints) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bMarkingPoints) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ HideMarkObjOrPoints(pDragWin); //STRIP001 /*?*/ bMarkingPoints=FALSE; //STRIP001 /*?*/ bUnmarking=FALSE; @@ -555,7 +555,7 @@ namespace binfilter { /*N*/ void SdrMarkView::BrkMarkGluePoints() /*N*/ { -/*N*/ if (bMarkingGluePoints) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bMarkingGluePoints) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ HideMarkObjOrPoints(pDragWin); //STRIP001 /*?*/ bMarkingGluePoints=FALSE; //STRIP001 /*?*/ bUnmarking=FALSE; @@ -758,7 +758,7 @@ namespace binfilter { /*N*/ } /*N*/ void SdrMarkView::SetMarkHdlHidden(BOOL bOn) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(bOn != bHdlHidden) //STRIP001 { //STRIP001 // one hide in which the old flag value is still set @@ -790,7 +790,7 @@ namespace binfilter { /*N*/ ULONG nMarkAnz=aMark.GetMarkCount(); /*N*/ BOOL bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles; /*N*/ BOOL bStdDrag=eDragMode==SDRDRAG_MOVE; -/*N*/ if (nMarkAnz==1 && bStdDrag && bFrmHdl) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (nMarkAnz==1 && bStdDrag && bFrmHdl) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const SdrObject* pObj=aMark.GetMark(0)->GetObj(); //STRIP001 /*?*/ if (pObj->GetObjInventor()==SdrInventor) { //STRIP001 /*?*/ UINT16 nIdent=pObj->GetObjIdentifier(); @@ -813,7 +813,7 @@ namespace binfilter { /*N*/ } /*N*/ if (!bFrmHdl) { /*N*/ // FrameHandles, wenn wenigstens 1 Obj kein SpecialDrag kann -/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const SdrMark* pM=aMark.GetMark(nMarkNum); //STRIP001 /*?*/ const SdrObject* pObj=pM->GetObj(); //STRIP001 /*?*/ bFrmHdl=!pObj->HasSpecialDrag(); @@ -835,7 +835,7 @@ namespace binfilter { /*N*/ && pSaveOldFocusHdl->GetObj() /*N*/ && pSaveOldFocusHdl->GetObj()->ISA(SdrPathObj) /*N*/ && (pSaveOldFocusHdl->GetKind() == HDL_POLY || pSaveOldFocusHdl->GetKind() == HDL_BWGT)) -/*N*/ {DBG_ASSERT(0, "STRIP"); +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ bSaveOldFocus = sal_True; //STRIP001 /*?*/ nSavePolyNum = pSaveOldFocusHdl->GetPolyNum(); //STRIP001 /*?*/ nSavePointNum = pSaveOldFocusHdl->GetPointNum(); @@ -866,7 +866,7 @@ namespace binfilter { /*N*/ if (bFrmHdl) { /*N*/ Rectangle aRect(GetMarkedObjRect()); /*N*/ if (!aRect.IsEmpty()) { // sonst nix gefunden -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bWdt0=aRect.Left()==aRect.Right(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bWdt0=aRect.Left()==aRect.Right(); //STRIP001 /*?*/ BOOL bHgt0=aRect.Top()==aRect.Bottom(); //STRIP001 /*?*/ if (bWdt0 && bHgt0) { //STRIP001 /*?*/ aHdl.AddHdl(new SdrHdl(aRect.TopLeft(),HDL_UPLFT)); @@ -886,7 +886,7 @@ namespace binfilter { /*N*/ } /*N*/ } else { /*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SdrMark* pM=aMark.GetMark(nMarkNum); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SdrMark* pM=aMark.GetMark(nMarkNum); //STRIP001 /*?*/ SdrObject* pObj=pM->GetObj(); //STRIP001 /*?*/ SdrPageView* pPV=pM->GetPageView(); //STRIP001 /*?*/ ULONG nSiz0=aHdl.GetHdlCount(); @@ -920,7 +920,7 @@ namespace binfilter { /*N*/ } // for nMarkNum /*N*/ } // if bFrmHdl else /*N*/ // GluePoint-Handles -/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const SdrMark* pM=aMark.GetMark(nMarkNum); //STRIP001 /*?*/ SdrObject* pObj=pM->GetObj(); //STRIP001 /*?*/ SdrPageView* pPV=pM->GetPageView(); @@ -958,7 +958,7 @@ namespace binfilter { /*N*/ /*N*/ // #105722# try to restore focus handle index from remembered values /*N*/ if(bSaveOldFocus) -/*N*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 /*?*/ for(sal_uInt32 a(0); a < aHdl.GetHdlCount(); a++) //STRIP001 /*?*/ { //STRIP001 /*?*/ SdrHdl* pCandidate = aHdl.GetHdl(a); @@ -982,7 +982,7 @@ namespace binfilter { /*N*/ } /*N*/ void SdrMarkView::SetDragMode(SdrDragMode eMode) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SdrDragMode eMode0=eDragMode; //STRIP001 eDragMode=eMode; //STRIP001 if (eDragMode==SDRDRAG_RESIZE) eDragMode=SDRDRAG_MOVE; @@ -1005,14 +1005,14 @@ namespace binfilter { /*?*/ case SDRDRAG_ROTATE: /*?*/ { /*?*/ // add rotation center -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SdrHdl* pHdl = new SdrHdl(aRef1, HDL_REF1); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SdrHdl* pHdl = new SdrHdl(aRef1, HDL_REF1); /*?*/ //STRIP001 /*?*/ aHdl.AddHdl(pHdl); /*?*/ /*?*/ break; /*?*/ } /*?*/ case SDRDRAG_MIRROR: -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // add mirror axis //STRIP001 /*?*/ SdrHdl* pHdl3 = new SdrHdl(aRef2, HDL_REF2); //STRIP001 /*?*/ SdrHdl* pHdl2 = new SdrHdl(aRef1, HDL_REF1); @@ -1029,7 +1029,7 @@ namespace binfilter { /*?*/ break; /*?*/ } /*?*/ case SDRDRAG_TRANSPARENCE: -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // add interactive transparence handle //STRIP001 /*?*/ UINT32 nMarkAnz = aMark.GetMarkCount(); //STRIP001 /*?*/ if(nMarkAnz == 1) @@ -1086,7 +1086,7 @@ namespace binfilter { /*?*/ break; /*?*/ } /*?*/ case SDRDRAG_GRADIENT: -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // add interactive gradient handle //STRIP001 /*?*/ UINT32 nMarkAnz = aMark.GetMarkCount(); //STRIP001 /*?*/ if(nMarkAnz == 1) @@ -1242,7 +1242,7 @@ namespace binfilter { /*N*/ void SdrMarkView::CheckMarked() /*N*/ { -/*N*/ for (ULONG nm=aMark.GetMarkCount(); nm>0;) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ for (ULONG nm=aMark.GetMarkCount(); nm>0;) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ nm--; //STRIP001 /*?*/ SdrMark* pM=aMark.GetMark(nm); //STRIP001 /*?*/ SdrObject* pObj=pM->GetObj(); @@ -1292,7 +1292,7 @@ namespace binfilter { // for SW and their rearranged painting; this method forces the // actual IAO-Handles to throw away saved contents /*N*/ void SdrMarkView::ForceInvalidateMarkHandles() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // #86973# //STRIP001 aHdl.Clear(); /*N*/ } @@ -1556,11 +1556,11 @@ namespace binfilter { /*N*/ { /*N*/ if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) { /*N*/ BrkAction(); -/*N*/ if (!bUnmark) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (!bUnmark) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aMark.InsertEntry(SdrMark(pObj,pPV)); /*N*/ } else { /*N*/ ULONG nPos=aMark.FindObject(pObj); -/*N*/ if (nPos!=CONTAINER_ENTRY_NOTFOUND) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (nPos!=CONTAINER_ENTRY_NOTFOUND) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aMark.DeleteMark(nPos); /*N*/ } /*N*/ } @@ -1603,7 +1603,7 @@ namespace binfilter { /*N*/ { /*N*/ if (nSiz<3) nSiz=3; /*N*/ nSiz/=2; -/*N*/ if (nSiz!=aHdl.GetHdlSize()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (nSiz!=aHdl.GetHdlSize()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ BOOL bMerk=IsMarkHdlShown(); //STRIP001 /*?*/ if (bMerk) HideMarkHdl(NULL); //STRIP001 /*?*/ aHdl.SetHdlSize(nSiz); @@ -1762,12 +1762,12 @@ namespace binfilter { /*N*/ if (pHitObj!=NULL) { /*N*/ if (ppRootObj!=NULL) *ppRootObj=pObj; /*N*/ if ((nOptions & SDRSEARCH_DEEP) !=0) pObj=pHitObj; -/*N*/ if ((nOptions & SDRSEARCH_TESTTEXTEDIT) !=0) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if ((nOptions & SDRSEARCH_TESTTEXTEDIT) !=0) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if (!pObj->HasTextEdit() || pPV->GetLockedLayers().IsSet(pObj->GetLayer())) { //STRIP001 /*?*/ pObj=NULL; //STRIP001 /*?*/ } /*N*/ } -/*N*/ if (pObj!=NULL && (nOptions & SDRSEARCH_TESTMACRO) !=0) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pObj!=NULL && (nOptions & SDRSEARCH_TESTMACRO) !=0) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ Point aP(aPt); aP-=pPV->GetOffset(); //STRIP001 /*?*/ SdrObjMacroHitRec aHitRec; //STRIP001 /*?*/ aHitRec.aPos=aPt; @@ -1778,7 +1778,7 @@ namespace binfilter { //STRIP001 /*?*/ if (!pObj->HasMacro() || !pObj->IsMacroHit(aHitRec)) pObj=NULL; /*N*/ } /*N*/ if (pObj!=NULL && (nOptions & SDRSEARCH_WITHTEXT) !=0 && pObj->GetOutlinerParaObject()==NULL) pObj=NULL; -/*N*/ if (pObj!=NULL && (nOptions & SDRSEARCH_TESTTEXTAREA) !=0) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pObj!=NULL && (nOptions & SDRSEARCH_TESTTEXTAREA) !=0) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ Point aP(aPt); aP-=pPV->GetOffset(); //STRIP001 /*?*/ if (!pObj->IsTextEditHit(aPt,0/*nTol*/,NULL)) pObj=NULL; /*N*/ } @@ -2132,10 +2132,10 @@ namespace binfilter { /*N*/ bMarkedObjRectDirty=TRUE; /*N*/ bMarkedPointsRectsDirty=TRUE; /*N*/ #ifndef SVX_LIGHT -/*?*/ if (pItemBrowser!=NULL) DBG_ASSERT(0, "STRIP"); //STRIP001 pItemBrowser->SetDirty(); +/*?*/ if (pItemBrowser!=NULL) DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pItemBrowser->SetDirty(); /*N*/ #endif /*N*/ BOOL bOneEdgeMarked=FALSE; -/*N*/ if (aMark.GetMarkCount()==1) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (aMark.GetMarkCount()==1) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const SdrObject* pObj=aMark.GetMark(0)->GetObj(); //STRIP001 /*?*/ if (pObj->GetObjInventor()==SdrInventor) { //STRIP001 /*?*/ UINT16 nIdent=pObj->GetObjIdentifier(); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv1.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv1.cxx index 2abbc78e9..451be704e 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv1.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdmrkv1.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-12-03 10:42:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -271,7 +271,7 @@ namespace binfilter { /*N*/ aHdl.Sort(); /*N*/ BOOL bHideHdl=IsMarkHdlShown() && IsSolidMarkHdl() && !bPlusHdlAlways; /*N*/ ULONG nHdlAnz=aHdl.GetHdlCount(); -/*N*/ for (ULONG nHdlNum=nHdlAnz; nHdlNum>0;) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ for (ULONG nHdlNum=nHdlAnz; nHdlNum>0;) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ nHdlNum--; //STRIP001 /*?*/ SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); //STRIP001 /*?*/ if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) { @@ -309,7 +309,7 @@ namespace binfilter { //STRIP001 /*?*/ } //STRIP001 /*?*/ } /*N*/ } -/*N*/ if (pM!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 // Den zuletzt geaenderten MarkEntry ggf. noch aufraeumen +/*N*/ if (pM!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Den zuletzt geaenderten MarkEntry ggf. noch aufraeumen //STRIP001 /*?*/ SdrUShortCont* pPts=pM->GetMarkedPoints(); //STRIP001 /*?*/ if (pPts!=NULL) pPts->ForceSort(); /*N*/ } @@ -410,7 +410,7 @@ namespace binfilter { /*N*/ { /*N*/ BOOL bChg=FALSE; /*N*/ ULONG nMarkAnz=aMark.GetMarkCount(); -/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrMark* pM=aMark.GetMark(nMarkNum); //STRIP001 /*?*/ const SdrObject* pObj=pM->GetObj(); //STRIP001 /*?*/ // PolyPoints @@ -532,7 +532,7 @@ namespace binfilter { //STRIP001 } /*N*/ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 if (!IsGluePointEditMode() && !bUnmark) return FALSE; //STRIP001 ForceUndirtyMrkPnt(); //STRIP001 BOOL bChgd=FALSE; @@ -606,7 +606,7 @@ namespace binfilter { /*N*/ SdrObject* pObj=pM->GetObj(); /*N*/ SdrPageView* pPV=pM->GetPageView(); /*N*/ const SdrGluePointList* pGPL=pObj->GetGluePointList(); -/*N*/ if (pGPL!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pGPL!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ Point aPnt(rPnt); //STRIP001 /*?*/ aPnt-=pPV->GetOffset(); //STRIP001 /*?*/ USHORT nNum=pGPL->HitTest(aPnt,*pOut,pObj,bBack,bNext,nId0); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx index f14ac29e9..be58b1c36 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdoattr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:16 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -579,7 +579,7 @@ namespace binfilter { /*N*/ /*N*/ // fuer ein bereits "lebendes" Model die Attribute von einem Pool in den anderen schieben /*N*/ if(pOldModel) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // Checken, ob sich die ScaleUnit geaendert hat. //STRIP001 /*?*/ // Denn dann muessen naemlich alle MetrikItems umgerechnet werden. //STRIP001 /*?*/ MapUnit aOldUnit(pOldModel->GetScaleUnit()); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx index 38f04744b..b7c9d20cb 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdobj.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:54 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1509,7 +1509,7 @@ static double SMALLEST_DASH_WIDTH(26.95); //STRIP001 } /*N*/ void SdrObject::SetName(const XubString& rStr) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(rStr.Len()) //STRIP001 { //STRIP001 ImpForcePlusData(); @@ -2455,7 +2455,7 @@ class ImpSkeleton; //STRIP001 } /*N*/ SdrObject* SdrObject::CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 if (pVisiLayer!=NULL && !pVisiLayer->IsSet(nLayerId)) return NULL; //STRIP001 Rectangle aO(GetBoundRect()); //STRIP001 aO.Left()-=nTol; aO.Top()-=nTol; aO.Right()+=nTol; aO.Bottom()+=nTol; @@ -2505,10 +2505,10 @@ class ImpSkeleton; /*N*/ bSnapRectDirty=TRUE; //rObj.bSnapRectDirty; /*N*/ bNotMasterCachable=rObj.bNotMasterCachable; /*N*/ if (pPlusData!=NULL) { delete pPlusData; pPlusData=NULL; } -/*N*/ if (rObj.pPlusData!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (rObj.pPlusData!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pPlusData=rObj.pPlusData->Clone(this); /*N*/ } -/*N*/ if (pPlusData!=NULL && pPlusData->pBroadcast!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pPlusData!=NULL && pPlusData->pBroadcast!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ delete pPlusData->pBroadcast; // der Broadcaster wird nicht mitkopiert //STRIP001 /*?*/ pPlusData->pBroadcast=NULL; /*N*/ } @@ -2670,7 +2670,7 @@ class ImpSkeleton; /*N*/ break; /*N*/ /*?*/ case META_POLYPOLYGON_ACTION: -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const PolyPolygon& rPolyPoly = ( (const MetaPolyPolygonAction&) rAct ).GetPolyPolygon(); //STRIP001 /*?*/ //STRIP001 /*?*/ if( rPolyPoly.Count() && ( rPolyPoly[ 0 ].GetSize() > 2 ) ) @@ -3446,7 +3446,7 @@ class ImpSkeleton; //////////////////////////////////////////////////////////////////////////////////////////////////// /*N*/ SdrObjGeoData* SdrObject::NewGeoData() const -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 return new SdrObjGeoData; /*N*/ } @@ -3476,7 +3476,7 @@ class ImpSkeleton; /*N*/ } /*N*/ /*N*/ void SdrObject::RestGeoData(const SdrObjGeoData& rGeo) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetRectsDirty(); //STRIP001 aOutRect =rGeo.aBoundRect ; //STRIP001 aAnchor =rGeo.aAnchor ; @@ -3694,7 +3694,7 @@ class ImpSkeleton; //////////////////////////////////////////////////////////////////////////////////////////////////// /*N*/ void SdrObject::ApplyNotPersistAttr(const SfxItemSet& rAttr) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetBoundRect(); //STRIP001 SendRepaintBroadcast(); //STRIP001 NbcApplyNotPersistAttr(rAttr); @@ -3863,7 +3863,7 @@ class ImpSkeleton; //STRIP001 } /*N*/ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const Rectangle& rSnap=GetSnapRect(); //STRIP001 const Rectangle& rLogic=GetLogicRect(); //STRIP001 lcl_SetItem(rAttr,bMerge,SdrObjMoveProtectItem(IsMoveProtect())); @@ -3986,7 +3986,7 @@ class ImpSkeleton; /*N*/ // erst Const-Aufruf um zu sehen, ob /*N*/ // ueberhaupt Klebepunkte da sind /*N*/ // const-Aufruf erzwingen! -/*N*/ if (GetGluePointList()!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrGluePointList* pGPL=ForceGluePointList(); //STRIP001 /*?*/ pGPL->SetReallyAbsolute(bOn,*this); /*N*/ } @@ -3997,7 +3997,7 @@ class ImpSkeleton; /*N*/ // erst Const-Aufruf um zu sehen, ob /*N*/ // ueberhaupt Klebepunkte da sind /*N*/ // const-Aufruf erzwingen! -/*N*/ if (GetGluePointList()!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrGluePointList* pGPL=ForceGluePointList(); //STRIP001 /*?*/ pGPL->Rotate(rRef,nWink,sn,cs,this); /*N*/ } @@ -4008,7 +4008,7 @@ class ImpSkeleton; /*N*/ // erst Const-Aufruf um zu sehen, ob /*N*/ // ueberhaupt Klebepunkte da sind /*N*/ // const-Aufruf erzwingen! -/*N*/ if (GetGluePointList()!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrGluePointList* pGPL=ForceGluePointList(); //STRIP001 /*?*/ pGPL->Mirror(rRef1,rRef2,this); /*N*/ } @@ -4019,7 +4019,7 @@ class ImpSkeleton; /*N*/ // erst Const-Aufruf um zu sehen, ob /*N*/ // ueberhaupt Klebepunkte da sind /*N*/ // const-Aufruf erzwingen! -/*N*/ if (GetGluePointList()!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrGluePointList* pGPL=ForceGluePointList(); //STRIP001 /*?*/ pGPL->Shear(rRef,nWink,tn,bVShear,this); /*N*/ } @@ -4255,7 +4255,7 @@ class ImpSkeleton; /*N*/ SdrObject* pRet = DoConvertToPolyObj(bBezier); /*N*/ /*N*/ if(pRet && bLineToArea) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrObject* pNewRet = ConvertToContourObj(pRet); //STRIP001 /*?*/ delete pRet; //STRIP001 /*?*/ pRet = pNewRet; @@ -4527,7 +4527,7 @@ class ImpSkeleton; /*N*/ } /*N*/ void SdrObject::SetPrintable(FASTBOOL bPrn) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 bNoPrint=!bPrn; //STRIP001 SetChanged(); //STRIP001 if (bInserted && pModel!=NULL) { diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx index 1f99b5ef8..e3ecdd0e7 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdocapt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -673,10 +673,10 @@ namespace binfilter { /*N*/ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rectangle& rRect) const /*N*/ { /*N*/ switch (rPara.eType) { -/*?*/ case SDRCAPT_TYPE1: DBG_ASSERT(0, "STRIP"); break;//STRIP001 ImpCalcTail1(rPara,rPoly,rRect); break; -/*?*/ case SDRCAPT_TYPE2: DBG_ASSERT(0, "STRIP"); break;//STRIP001 ImpCalcTail2(rPara,rPoly,rRect); break; +/*?*/ case SDRCAPT_TYPE1: DBG_BF_ASSERT(0, "STRIP"); break;//STRIP001 ImpCalcTail1(rPara,rPoly,rRect); break; +/*?*/ case SDRCAPT_TYPE2: DBG_BF_ASSERT(0, "STRIP"); break;//STRIP001 ImpCalcTail2(rPara,rPoly,rRect); break; /*N*/ case SDRCAPT_TYPE3: ImpCalcTail3(rPara,rPoly,rRect); break; -/*?*/ case SDRCAPT_TYPE4: DBG_ASSERT(0, "STRIP"); break;//STRIP001 ImpCalcTail4(rPara,rPoly,rRect); break; +/*?*/ case SDRCAPT_TYPE4: DBG_BF_ASSERT(0, "STRIP"); break;//STRIP001 ImpCalcTail4(rPara,rPoly,rRect); break; /*N*/ } /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx index 440c25697..80676ef16 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdocirc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -413,7 +413,7 @@ namespace binfilter { /*?*/ /*?*/ // new shadow line drawing /*?*/ if( pLineGeometry.get() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ // draw the line geometry //STRIP001 /*?*/ ImpDrawShadowLineGeometry(rXOut, rSet, *pLineGeometry); /*?*/ } @@ -461,10 +461,10 @@ namespace binfilter { /*N*/ } /*N*/ /*N*/ FASTBOOL bOk=TRUE; -/*N*/ if (HasText()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (HasText()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ bOk=SdrTextObj::Paint(rXOut,rInfoRec); /*N*/ } -/*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ bOk=PaintGluePoints(rXOut,rInfoRec); /*N*/ } /*N*/ diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx index 5f949b79f..051c50e19 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdoedge.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -127,7 +127,7 @@ namespace binfilter { /*N*/ if (bAutoVertex) { /*N*/ rGP=pObj->GetVertexGluePoint(nConId); /*N*/ bRet=TRUE; -/*N*/ } else if (bAutoCorner) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ } else if (bAutoCorner) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ rGP=pObj->GetCornerGluePoint(nConId); //STRIP001 /*?*/ bRet=TRUE; /*?*/ } else { @@ -2413,7 +2413,7 @@ je Objekt variiert von 0-3: //STRIP001 } /*N*/ void SdrEdgeObj::NbcSetPoint(const Point& rPnt, USHORT i) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ // ToDo: Umconnekten fehlt noch //STRIP001 /*?*/ ImpUndirtyEdgeTrack(); //STRIP001 /*?*/ USHORT nAnz=pEdgeTrack->GetPointCount(); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx index 323f62a32..1e7b4ccc4 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdograf.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:46 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -319,7 +319,7 @@ namespace binfilter { // ----------------------------------------------------------------------------- /*N*/ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); Graphic aTransGraphic( GetGraphic() );return aTransGraphic;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); Graphic aTransGraphic( GetGraphic() );return aTransGraphic;//STRIP001 //STRIP001 // #107947# Refactored most of the code to GraphicObject, where //STRIP001 // everybody can use e.g. the cropping functionality //STRIP001 @@ -423,7 +423,7 @@ namespace binfilter { // ----------------------------------------------------------------------------- /*N*/ String SdrGrafObj::GetGrafStreamURL() const -/*N*/ {DBG_ASSERT(0, "STRIP"); String aString; return aString;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); String aString; return aString;//STRIP001 //STRIP001 return pGraphic->GetUserData(); /*N*/ } @@ -912,7 +912,7 @@ namespace binfilter { /*N*/ const SdrView* pView = ( rInfoRec.pPV ? &rInfoRec.pPV->GetView() : NULL ); /*N*/ /*N*/ if( bSwappedOut && !bDraft ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( !ImpUpdateGraphicLink() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ if( ( OUTDEV_WINDOW == pOutDev->GetOutDevType() ) && !bMtfRecording && pView && pView->IsSwapAsynchron() ) @@ -966,7 +966,7 @@ namespace binfilter { /*?*/ bEnable = ( eAnimMode != SDR_ANIMATION_DISABLE ); /*?*/ /*?*/ if( bEnable ) -/*?*/ {{DBG_ASSERT(0, "STRIP"); }//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 //STRIP001 /*?*/ const SvtAccessibilityOptions& rOpt = const_cast< SdrView* >( pView )->getAccessibilityOptions(); //STRIP001 /*?*/ sal_Bool bIsAllowedAnimatedGraphics = rOpt.GetIsAllowAnimatedGraphics(); //STRIP001 /*?*/ @@ -983,7 +983,7 @@ namespace binfilter { /*?*/ if( bEnable ) /*?*/ { /*?*/ if( eAnimMode == SDR_ANIMATION_ANIMATE ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pGraphic->SetAnimationNotifyHdl( LINK( this, SdrGrafObj, ImpAnimationHdl ) ); //STRIP001 /*?*/ pGraphic->StartAnimation( pOutDev, aLogPos, aLogSize, 0, &aAttr ); /*?*/ } @@ -1040,7 +1040,7 @@ namespace binfilter { /*N*/ FASTBOOL bFill = FALSE; /*N*/ /*N*/ if( bEmptyPresObj ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 bFill = !ImpPaintEmptyPres( pOutDev ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 bFill = !ImpPaintEmptyPres( pOutDev ); /*N*/ /*N*/ // und nun noch einen grauen Rahmen drum herum, Text rein, ... /*N*/ if( !bEmptyPresObj ) @@ -1177,7 +1177,7 @@ namespace binfilter { /*N*/ #else /*N*/ if( rGraf.aFileName.Len() ) /*N*/ #endif -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 SetGraphicLink( aFileName, aFilterName ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 SetGraphicLink( aFileName, aFilterName ); /*N*/ /*N*/ ImpSetAttrToGrafInfo(); /*N*/ } @@ -1303,7 +1303,7 @@ namespace binfilter { /*N*/ SdrRectObj::SetPage( pNewPage ); /*N*/ /*N*/ if(aFileName.Len() && bInsert) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ImpLinkAnmeldung(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ImpLinkAnmeldung(); /*N*/ } // ----------------------------------------------------------------------------- @@ -1329,7 +1329,7 @@ namespace binfilter { /*N*/ SdrRectObj::SetModel(pNewModel); /*N*/ /*N*/ if( bChg && aFileName.Len() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ImpLinkAnmeldung(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ImpLinkAnmeldung(); /*N*/ } // ----------------------------------------------------------------------------- diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx index 5dba1cffa..06036f61e 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdogrp.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:54 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,7 +237,7 @@ namespace binfilter { /*N*/ ImpSdrObjGroupLinkUserData::~ImpSdrObjGroupLinkUserData() /*N*/ { /*N*/ #ifndef SVX_LIGHT -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete pLink; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete pLink; /*N*/ #endif /*N*/ } @@ -414,7 +414,7 @@ namespace binfilter { /*N*/ for (USHORT nNum=nAnz; nNum>0;) { /*N*/ nNum--; /*N*/ SdrObjUserData* pData=GetUserData(nNum); -/*N*/ if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJGROUPLINK) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJGROUPLINK) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ DeleteUserData(nNum); /*N*/ } /*N*/ } @@ -566,7 +566,7 @@ namespace binfilter { /*N*/ void SdrObjGroup::ImpLinkAnmeldung() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 #ifndef SVX_LIGHT //STRIP001 ImpSdrObjGroupLinkUserData* pData=GetLinkUserData(); //STRIP001 SvxLinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL; @@ -603,7 +603,7 @@ namespace binfilter { /*N*/ SvxLinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL; /*N*/ if (pLinkManager!=NULL && pData!=NULL && pData->pLink!=NULL) { // Nicht 2x Abmelden /*N*/ // Bei Remove wird *pLink implizit deleted -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pLinkManager->Remove( pData->pLink ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pLinkManager->Remove( pData->pLink ); //STRIP001 /*?*/ pData->pLink=NULL; /*N*/ } /*N*/ #endif // SVX_LIGHT @@ -838,7 +838,7 @@ namespace binfilter { /*?*/ pOutDev->DrawRect(aOutRect); /*N*/ } /*N*/ } -/*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ bOk=PaintGluePoints(rXOut,rInfoRec); /*N*/ } /*N*/ return bOk; @@ -1002,7 +1002,7 @@ namespace binfilter { /*N*/ long nDivY=aOld.Bottom()-aOld.Top(); /*N*/ if (nDivX==0) { nMulX=1; nDivX=1; } /*N*/ if (nDivY==0) { nMulY=1; nDivY=1; } -/*N*/ if (nMulX!=nDivX || nMulY!=nDivY) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (nMulX!=nDivX || nMulY!=nDivY) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ Fraction aX(nMulX,nDivX); //STRIP001 /*?*/ Fraction aY(nMulY,nDivY); //STRIP001 /*?*/ NbcResize(aOld.TopLeft(),aX,aY); @@ -1516,7 +1516,7 @@ namespace binfilter { /*N*/ if (!IsLinkedGroup()) { /*N*/ SdrObjList* pOL=pSub; /*N*/ ULONG nObjAnz=pOL->GetObjCount(); -/*N*/ for (ULONG i=0; i<nObjAnz; i++) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ for (ULONG i=0; i<nObjAnz; i++) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pOL->GetObj(i)->SetStyleSheet(pNewStyleSheet,bDontRemoveHardAttr); /*N*/ } /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx index 745fd8a85..192a80011 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdomeas.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:19 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -520,7 +520,7 @@ namespace binfilter { /*N*/ if (rPol.eUsedTextVPos==SDRMEASURE_TEXTVAUTO) rPol.eUsedTextVPos=SDRMEASURE_ABOVE; /*N*/ FASTBOOL bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE; /*N*/ if (rPol.eUsedTextVPos==SDRMEASURETEXT_VERTICALCENTERED) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1) { +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1) { //STRIP001 /*?*/ bBrkLine=TRUE; // Unterbrochene Linie, wenn nur 1 Absatz. //STRIP001 /*?*/ } /*N*/ } @@ -1585,7 +1585,7 @@ namespace binfilter { //STRIP001 } /*N*/ FASTBOOL SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl) -/*N*/ {DBG_ASSERT(0, "STRIP");return FALSE; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE; //STRIP001 //STRIP001 UndirtyText(); //STRIP001 return SdrTextObj::BegTextEdit(rOutl); /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx index 68271fb8a..56da03c29 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdoole2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:20 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -212,7 +212,7 @@ SO2_DECL_REF(SvInPlaceObject) // ----------------------------------------------------------------------------- /*N*/ SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& rNewObjRef, const XubString& rNewObjName, FASTBOOL bFrame_) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 bInDestruction = FALSE; //STRIP001 Init(); //STRIP001 @@ -238,7 +238,7 @@ SO2_DECL_REF(SvInPlaceObject) /*N*/ SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_): /*N*/ SdrRectObj(rNewRect) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 bInDestruction = FALSE; //STRIP001 Init(); //STRIP001 @@ -485,7 +485,7 @@ SO2_DECL_REF(SvInPlaceObject) /*?*/ /*?*/ if( pDestPers && pSrcPers && ( pDestPers != pSrcPers ) ) /*?*/ { -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ImpCopyObject( *pSrcPers, *pDestPers, mpImpl->aPersistName ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ImpCopyObject( *pSrcPers, *pDestPers, mpImpl->aPersistName ); /*?*/ } /*N*/ } /*N*/ @@ -966,7 +966,7 @@ SO2_DECL_REF(SvInPlaceObject) /*?*/ SetRectsDirty(); /*N*/ } /*N*/ if( (NULL == pModel) || !pModel->isLocked() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ImpSetVisAreaSize(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ImpSetVisAreaSize(); /*N*/ } // ----------------------------------------------------------------------------- @@ -984,7 +984,7 @@ SO2_DECL_REF(SvInPlaceObject) /*N*/ { /*N*/ SdrRectObj::NbcSetSnapRect(rRect); /*N*/ if( (NULL == pModel) || !pModel->isLocked() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ImpSetVisAreaSize(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ImpSetVisAreaSize(); /*N*/ } // ----------------------------------------------------------------------------- @@ -993,13 +993,13 @@ SO2_DECL_REF(SvInPlaceObject) /*N*/ { /*N*/ SdrRectObj::NbcSetLogicRect(rRect); /*N*/ if( (NULL == pModel) || !pModel->isLocked() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ImpSetVisAreaSize(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ImpSetVisAreaSize(); /*N*/ } // ----------------------------------------------------------------------------- /*N*/ FASTBOOL SdrOle2Obj::HasGDIMetaFile() const -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 GetObjRef(); // try to load inplace object //STRIP001 SvInPlaceObjectRef& rIPRef=*ppObjRef; //STRIP001 BOOL bOK = FALSE; @@ -1012,7 +1012,7 @@ SO2_DECL_REF(SvInPlaceObject) // ----------------------------------------------------------------------------- /*N*/ const GDIMetaFile* SdrOle2Obj::GetGDIMetaFile() const -/*N*/ {DBG_ASSERT(0, "STRIP");return NULL; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");return NULL; //STRIP001 //STRIP001 if( mpImpl->pMetaFile ) //STRIP001 { //STRIP001 delete ((SdrOle2Obj*)this)->mpImpl->pMetaFile; @@ -1064,7 +1064,7 @@ SO2_DECL_REF(SvInPlaceObject) /*N*/ bPreview = TRUE; /*N*/ /*N*/ if( bPreview ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // set preview graphic (not for empty presentation objects) //STRIP001 /*?*/ GetGDIMetaFile(); //STRIP001 /*?*/ if( mpImpl->pMetaFile ) @@ -1142,7 +1142,7 @@ SO2_DECL_REF(SvInPlaceObject) /*N*/ { /*N*/ SdrRectObj::NbcMove(rSize); /*N*/ if( (NULL == pModel) || !pModel->isLocked() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ImpSetVisAreaSize(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ImpSetVisAreaSize(); /*N*/ } // ----------------------------------------------------------------------------- diff --git a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx index d02a6dfb3..54746a06f 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdopath.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -400,7 +400,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } /*?*/ /*?*/ // new shadow line drawing /*?*/ if( pLineGeometry.get() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ // draw the line geometry //STRIP001 /*?*/ ImpDrawShadowLineGeometry(rXOut, rSet, *pLineGeometry); /*?*/ } @@ -435,7 +435,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } /*?*/ bOk=SdrTextObj::Paint(rXOut,rInfoRec); /*N*/ } /*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bOk=PaintGluePoints(rXOut,rInfoRec); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bOk=PaintGluePoints(rXOut,rInfoRec); /*N*/ } /*N*/ /*N*/ return bOk; @@ -2811,7 +2811,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } /*N*/ aPathPolygon[nPolyNum][nPointAnz]=aStartPt; /*N*/ } /*N*/ } else { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aPathPolygon.Remove(nPolyNum); // leere Polygone raus +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aPathPolygon.Remove(nPolyNum); // leere Polygone raus /*N*/ } /*N*/ /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx b/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx index 8615205c6..47763b5c0 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdorect.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -197,7 +197,7 @@ namespace binfilter { /*N*/ } /*N*/ void SdrRectObj::RecalcXPoly() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 pXPoly=new XPolygon(ImpCalcXPoly(aRect,GetEckenradius())); /*N*/ } @@ -372,7 +372,7 @@ namespace binfilter { /*?*/ if( pLineGeometry.get() ) /*?*/ { /*?*/ // draw the line geometry -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImpDrawShadowLineGeometry(rXOut, rSet, *pLineGeometry); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImpDrawShadowLineGeometry(rXOut, rSet, *pLineGeometry); /*?*/ } /*N*/ } @@ -406,7 +406,7 @@ namespace binfilter { /*?*/ bOk=SdrTextObj::Paint(rXOut,rInfoRec); /*N*/ } /*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bOk=PaintGluePoints(rXOut,rInfoRec); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bOk=PaintGluePoints(rXOut,rInfoRec); /*N*/ } /*N*/ /*N*/ return bOk; diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx index 890fa2797..ab1f31aa6 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdotext.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:46 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -604,7 +604,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } /*?*/ rOutliner.SetText(*pOutlinerParaObject); /*?*/ delete pOutlinerParaObject; /*?*/ pOutlinerParaObject=NULL; -/*?*/ if (bScaleUnitChanged) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ if (bScaleUnitChanged) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ Fraction aMetricFactor=GetMapFactor(aOldUnit,aNewUnit).X(); //STRIP001 /*?*/ //STRIP001 /*?*/ // Funktioniert nicht richtig: @@ -896,7 +896,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } /*N*/ /*N*/ rOutliner.SetPaperSize(aNullSize); /*N*/ if (bContourFrame) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ImpSetContourPolygon( rOutliner, aAnkRect, bLineWidth ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ImpSetContourPolygon( rOutliner, aAnkRect, bLineWidth ); /*N*/ /*N*/ // Text in den Outliner stecken - ggf. den aus dem EditOutliner /*N*/ OutlinerParaObject* pPara=pOutlinerParaObject; @@ -1967,7 +1967,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } //STRIP001 } /*N*/ void SdrTextObj::SetupOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ImpInitDrawOutliner( rOutl ); //STRIP001 UpdateOutlinerFormatting( rOutl, rPaintRect ); //STRIP001 } @@ -2084,7 +2084,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } ///*N*/ if (bAnimated) { ///*N*/ ImpSdrMtfAnimator* pAnimator=((SdrTextObj*)this)->ImpGetMtfAnimator(); ///*N*/ if (pAnimator!=NULL) { -///*?*/ if (pPageView==NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +///*?*/ if (pPageView==NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ////STRIP001 /*?*/ pAnimator->Stop(); ///*?*/ } else { ///*?*/ for (ULONG nInfoNum=pAnimator->GetInfoCount(); nInfoNum>0;) { diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx index 02b8d05c4..99e16ff80 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdotxat.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -348,7 +348,7 @@ namespace binfilter { /*?*/ /*?*/ if(nParaCount) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ESelection aSelection( 0, 0, EE_PARA_ALL, EE_PARA_ALL); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ESelection aSelection( 0, 0, EE_PARA_ALL, EE_PARA_ALL); //STRIP001 /*?*/ rOutliner.RemoveAttribs(aSelection, TRUE, 0); //STRIP001 /*?*/ //STRIP001 /*?*/ OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotxed.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotxed.cxx index 670bf60b9..45360943d 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdotxed.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdotxed.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdotxed.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,7 @@ namespace binfilter { /*N*/ } /*N*/ FASTBOOL SdrTextObj::BegTextEdit(SdrOutliner& rOutl) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 if (pEdtOutl!=NULL) return FALSE; // Textedit laeuft evtl. schon an einer anderen View! //STRIP001 pEdtOutl=&rOutl; //STRIP001 @@ -289,7 +289,7 @@ namespace binfilter { //STRIP001 } /*N*/ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if(rOutl.IsModified()) //STRIP001 { //STRIP001 OutlinerParaObject* pNewText = NULL; diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx index da7cf5690..64b22ef95 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdotxln.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:24 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,7 +143,7 @@ namespace binfilter { /*?*/ void ImpSdrObjTextLink::Closed() /*?*/ { /*?*/ if (pSdrObj ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // pLink des Objekts auf NULL setzen, da die Link-Instanz ja gerade destruiert wird. //STRIP001 /*?*/ ImpSdrObjTextLinkUserData* pData=pSdrObj->GetLinkUserData(); //STRIP001 /*?*/ if (pData!=NULL) pData->pLink=NULL; @@ -179,7 +179,7 @@ namespace binfilter { /*?*/ } /*?*/ } /*?*/ if (pSdrObj ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pSdrObj->ReloadLinkedText( bForceReload ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pSdrObj->ReloadLinkedText( bForceReload ); /*?*/ } #endif // SVX_LIGHT @@ -206,7 +206,7 @@ namespace binfilter { /*N*/ ImpSdrObjTextLinkUserData::~ImpSdrObjTextLinkUserData() /*N*/ { /*N*/ #ifndef SVX_LIGHT -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete pLink; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete pLink; /*N*/ #endif /*N*/ } @@ -478,7 +478,7 @@ namespace binfilter { /*N*/ SvxLinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL; /*N*/ if (pLinkManager!=NULL && pData!=NULL && pData->pLink!=NULL) { // Nicht 2x Abmelden /*N*/ // Bei Remove wird *pLink implizit deleted -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pLinkManager->Remove( pData->pLink ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pLinkManager->Remove( pData->pLink ); //STRIP001 /*?*/ pData->pLink=NULL; /*N*/ } /*N*/ #endif // SVX_LIGHT diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx index 18cdd3351..ae5577f8c 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdotxtr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,7 +111,7 @@ namespace binfilter { /*N*/ if (bTextFrame && (pModel==NULL || !pModel->IsPasteResize())) { // #51139# /*N*/ if (nTWdt0!=nTWdt1 && IsAutoGrowWidth() ) NbcSetMinTextFrameWidth(nTWdt1); /*N*/ if (nTHgt0!=nTHgt1 && IsAutoGrowHeight()) NbcSetMinTextFrameHeight(nTHgt1); -/*N*/ if (GetFitToSize()==SDRTEXTFIT_RESIZEATTR) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (GetFitToSize()==SDRTEXTFIT_RESIZEATTR) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ NbcResizeTextAttributes(Fraction(nTWdt1,nTWdt0),Fraction(nTHgt1,nTHgt0)); /*N*/ } /*N*/ NbcAdjustTextFrameWidthAndHeight(); @@ -139,7 +139,7 @@ namespace binfilter { /*N*/ if (bTextFrame) { /*N*/ if (nTWdt0!=nTWdt1 && IsAutoGrowWidth() ) NbcSetMinTextFrameWidth(nTWdt1); /*N*/ if (nTHgt0!=nTHgt1 && IsAutoGrowHeight()) NbcSetMinTextFrameHeight(nTHgt1); -/*N*/ if (GetFitToSize()==SDRTEXTFIT_RESIZEATTR) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (GetFitToSize()==SDRTEXTFIT_RESIZEATTR) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ NbcResizeTextAttributes(Fraction(nTWdt1,nTWdt0),Fraction(nTHgt1,nTHgt0)); /*N*/ } /*N*/ NbcAdjustTextFrameWidthAndHeight(); @@ -256,7 +256,7 @@ namespace binfilter { /*N*/ if (nTWdt0!=nTWdt1 && IsAutoGrowWidth() ) NbcSetMinTextFrameWidth(nTWdt1); /*N*/ if (nTHgt0!=nTHgt1 && IsAutoGrowHeight()) NbcSetMinTextFrameHeight(nTHgt1); /*N*/ if (GetFitToSize()==SDRTEXTFIT_RESIZEATTR) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 NbcResizeTextAttributes(Fraction(nTWdt1,nTWdt0),Fraction(nTHgt1,nTHgt0)); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 NbcResizeTextAttributes(Fraction(nTWdt1,nTWdt0),Fraction(nTHgt1,nTHgt0)); /*N*/ } /*?*/ NbcAdjustTextFrameWidthAndHeight(); /*N*/ } @@ -426,7 +426,7 @@ namespace binfilter { /*N*/ if (nAnz>0) { /*N*/ USHORT nMax=USHORT(nAnz-1); /*N*/ Point aPnt(rXP[0]); -/*N*/ if (aPnt!=rXP[nMax]) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (aPnt!=rXP[nMax]) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aXPP[i].SetPointCount(nAnz+1); //STRIP001 /*?*/ aXPP[i][nAnz]=aPnt; /*N*/ } @@ -450,7 +450,7 @@ namespace binfilter { /*N*/ ePathKind=bClosed?OBJ_POLY:OBJ_PLIN; /*N*/ } /*N*/ SdrPathObj* pPathObj=new SdrPathObj(ePathKind,aXPP); -/*N*/ if (bBezier) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bBezier) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pPathObj->ConvertAllSegments(SDRPATH_CURVE); /*N*/ } /*N*/ ImpConvertSetAttrAndLayer(pPathObj,bNoSetAttr); @@ -460,7 +460,7 @@ namespace binfilter { /*N*/ SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) const /*N*/ { /*N*/ if (!ImpCanConvTextToCurve()) return pObj; -/*?*/ DBG_ASSERT(0, "STRIP"); return pObj;//STRIP001 SdrObject* pText=ImpConvertObj(!bBezier); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return pObj;//STRIP001 SdrObject* pText=ImpConvertObj(!bBezier); //STRIP001 /*?*/ if (pText==NULL) return pObj; //STRIP001 /*?*/ if (pObj==NULL) return pText; //STRIP001 /*?*/ if (pText->IsGroupObject()) { diff --git a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx index c7214981e..2f912dd6b 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdouno.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -260,7 +260,7 @@ namespace binfilter { /*N*/ /*N*/ // nur ein owner darf eigenstaendig erzeugen /*N*/ if (rModelName.Len()) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 CreateUnoControlModel(rModelName); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 CreateUnoControlModel(rModelName); /*N*/ } /*?*/ SdrUnoObj::SdrUnoObj(const String& rModelName, @@ -275,7 +275,7 @@ namespace binfilter { /*?*/ /*?*/ // nur ein owner darf eigenstaendig erzeugen /*?*/ if (rModelName.Len()) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 CreateUnoControlModel(rModelName,rxSFac); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 CreateUnoControlModel(rModelName,rxSFac); /*?*/ } /*N*/ SdrUnoObj::~SdrUnoObj() @@ -639,7 +639,7 @@ namespace binfilter { /*N*/ return; /*N*/ /*N*/ if (pOut) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Nur dieses eine OutDev beruecksichtigen //STRIP001 /*?*/ uno::Reference< awt::XWindow > xWindow(GetUnoControl(pOut), uno::UNO_QUERY); //STRIP001 /*?*/ if (xWindow.is()) @@ -879,7 +879,7 @@ namespace binfilter { /*N*/ #endif /*N*/ /*N*/ if (bOwnUnoControlModel) // nur als besitzt des Models dieses auch lesen -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // UNICODE: rIn >> aUnoControlModelTypeName; //STRIP001 /*?*/ rIn.ReadByteString(aUnoControlModelTypeName); //STRIP001 /*?*/ @@ -931,7 +931,7 @@ namespace binfilter { /*N*/ } /*N*/ uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const OutputDevice* pOut) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return uno::Reference< awt::XControl >();//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Reference< awt::XControl >();//STRIP001 //STRIP001 uno::Reference< awt::XControl > xUnoControl; //STRIP001 //STRIP001 if (pModel && xUnoControlModel.is()) diff --git a/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx b/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx index cb1a35b4f..2a9fba30a 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdovirt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:27 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -540,17 +540,17 @@ namespace binfilter { //////////////////////////////////////////////////////////////////////////////////////////////////// /*N*/ SdrObjGeoData* SdrVirtObj::NewGeoData() const -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 return rRefObj.NewGeoData(); /*N*/ } /*N*/ void SdrVirtObj::SaveGeoData(SdrObjGeoData& rGeo) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 rRefObj.SaveGeoData(rGeo); /*N*/ } /*N*/ void SdrVirtObj::RestGeoData(const SdrObjGeoData& rGeo) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 rRefObj.RestGeoData(rGeo); //STRIP001 SetRectsDirty(); /*N*/ } @@ -644,7 +644,7 @@ namespace binfilter { //STRIP001 } /*N*/ void SdrVirtObj::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 rRefObj.SetStyleSheet(pNewStyleSheet,bDontRemoveHardAttr); /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx index f87e6717e..f399fd5f5 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdpage.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:55 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -159,7 +159,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ void SdrObjList::operator=(const SdrObjList& rSrcList) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 Clear(); //STRIP001 eListKind=rSrcList.eListKind; //STRIP001 CopyObjects(rSrcList); @@ -414,7 +414,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum) -/*N*/ {DBG_ASSERT(0, "STRIP");return NULL; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");return NULL; //STRIP001 //STRIP001 ULONG nAnz=GetObjCount(); //STRIP001 SdrObject* pObj=(SdrObject*)aList.Remove(nObjNum); //STRIP001 DBG_ASSERT(pObj!=NULL,"Object zum Removen nicht gefunden"); @@ -786,7 +786,7 @@ using namespace ::com::sun::star; /*N*/ if( bPaintFlag ) /*N*/ { /*N*/ if( pObj->IsNeedColorRestore() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if (bColorsDirty && bRestoreColors) //STRIP001 /*?*/ aHDCMerk.Restore(*pOut); //STRIP001 /*?*/ @@ -1310,7 +1310,7 @@ using namespace ::com::sun::star; /*N*/ } /*?*/ void SdrObjList::FlattenGroups() -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 sal_Int32 nObj = GetObjCount(); //STRIP001 sal_Int32 i; //STRIP001 for( i=nObj-1; i>=0; --i) @@ -1318,7 +1318,7 @@ using namespace ::com::sun::star; /*?*/ } /*?*/ void SdrObjList::UnGroupObj( ULONG nObjNum ) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 // if the given object is no group, this method is a noop //STRIP001 SdrObject* pUngroupObj = GetObj( nObjNum ); //STRIP001 if( pUngroupObj ) @@ -1424,7 +1424,7 @@ using namespace ::com::sun::star; //////////////////////////////////////////////////////////////////////////////////////////////////// /*N*/ void SdrPageGridFrameList::Clear() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 USHORT nAnz=GetCount(); //STRIP001 for (USHORT i=0; i<nAnz; i++) { //STRIP001 delete GetObject(i); @@ -1533,7 +1533,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ void SdrPage::SetOrientation(Orientation eOri) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // Quadratisch ist und bleibt immer Portrait //STRIP001 Size aSiz(GetSize()); //STRIP001 if (aSiz.Width()!=aSiz.Height()) { @@ -2098,7 +2098,7 @@ using namespace ::com::sun::star; /** returns an averaged background color of this page */ /*N*/ Color SdrPage::GetBackgroundColor( SdrPageView* pView ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); Color aColor; return aColor; +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); Color aColor; return aColor; //STRIP001 Color aColor; //STRIP001 //STRIP001 if( (NULL == pView) || (pView->GetApplicationDocumentColor() == COL_AUTO) ) diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx index a0164938c..3abbc34e7 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdpagv.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:24:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -182,7 +182,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------------ /*?*/ void SdrUnoControlRec::adjustControlVisibility( bool _bForce ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 uno::Reference< awt::XWindow > xControlWindow( xControl, uno::UNO_QUERY ); //STRIP001 if ( xControlWindow.is() && !xControl->isDesignMode() ) //STRIP001 { @@ -201,7 +201,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------------ /*?*/ void SdrUnoControlRec::switchControlListening( bool _bStart ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 uno::Reference< awt::XWindow> xWindow( xControl, uno::UNO_QUERY ); //STRIP001 if ( xWindow.is() ) //STRIP001 { @@ -229,7 +229,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------------ /*?*/ void SdrUnoControlRec::switchPropertyListening( bool _bStart, bool _bListenForAll ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 DBG_ASSERT( xControl.is(), "SdrUnoControlRec::switchPropertyListening: no control!" ); //STRIP001 if ( xControl.is() ) //STRIP001 { @@ -261,7 +261,7 @@ using namespace ::com::sun::star; /*N*/ { /*N*/ uno::Reference< awt::XControl > xSource( Source.Source, uno::UNO_QUERY); /*N*/ if (xSource.is()) -/*?*/ { {DBG_ASSERT(0, "STRIP");}//STRIP001 // it's the control we're responsible for +/*?*/ { {DBG_BF_ASSERT(0, "STRIP");}//STRIP001 // it's the control we're responsible for //STRIP001 /*?*/ switchControlListening( false ); //STRIP001 /*?*/ //STRIP001 /*?*/ if (pParent) @@ -294,7 +294,7 @@ using namespace ::com::sun::star; /*N*/ void SAL_CALL SdrUnoControlRec::windowShown( const ::com::sun::star::lang::EventObject& e ) /*N*/ throw(::com::sun::star::uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !mnPaintLevel ) //STRIP001 { //STRIP001 if (!IsVisible()) @@ -307,7 +307,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------------ /*N*/ void SAL_CALL SdrUnoControlRec::windowHidden( const ::com::sun::star::lang::EventObject& e ) /*N*/ throw(::com::sun::star::uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 bVisible = FALSE; //STRIP001 //STRIP001 // Im Designmodus ist das Control nicht sichtbar und der drawing layer ist @@ -325,7 +325,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------------ /*N*/ void SAL_CALL SdrUnoControlRec::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) /*N*/ throw(::com::sun::star::uno::RuntimeException) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (!xControl.is()) //STRIP001 return; //STRIP001 @@ -380,7 +380,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------------ /*?*/ void SAL_CALL SdrUnoControlRec::modeChanged( const util::ModeChangeEvent& _rSource ) throw (uno::RuntimeException) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 // if the control is part of a invisible layer, we need to explicitly hide it in alive mode //STRIP001 // 2003-06-03 - #110592# - fs@openoffice.org //STRIP001 adjustControlVisibility( false ); @@ -452,7 +452,7 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------------ /*?*/ void SdrUnoControlRec::switchDesignModeListening( bool _bStart ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 if ( (bool)IsListening() != _bStart ) //STRIP001 { //STRIP001 bIsListening = _bStart; @@ -810,7 +810,7 @@ using namespace ::com::sun::star; /*N*/ } /*?*/ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SdrPageView::GetControlContainer( const OutputDevice* _pDevice ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 /*?*/ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > xReturn; //STRIP001 /*?*/ USHORT nWinPos = pWinList->Find( const_cast< OutputDevice* >( _pDevice ) ); //STRIP001 /*?*/ if ( SDRPAGEVIEWWIN_NOTFOUND != nWinPos ) @@ -942,7 +942,7 @@ using namespace ::com::sun::star; /*N*/ eKind == HINT_CONTROLREMOVED) /*N*/ /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImpUnoRemoved(pObj); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImpUnoRemoved(pObj); /*N*/ } /*N*/ } /*N*/ else if (pObj->GetObjIdentifier() == OBJ_GRUP && @@ -969,7 +969,7 @@ using namespace ::com::sun::star; /*?*/ eKind == HINT_CONTROLREMOVED) /*?*/ /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImpUnoRemoved(pObj); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImpUnoRemoved(pObj); /*?*/ } /*N*/ } /*N*/ } @@ -1986,7 +1986,7 @@ using namespace ::com::sun::star; /*?*/ void SdrPageView::LayerVisibilityChanged( const SdrLayerID _nLayerId, bool _bNewVisibility ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 // adjust the visibility of UNO controls, if necessary //STRIP001 const SdrPageViewWinList& rWinList = GetWinList(); //STRIP001 const USHORT nWinCount = rWinList.GetCount(); @@ -2251,7 +2251,7 @@ using namespace ::com::sun::star; /*?*/ BOOL bGlueInvalidate = (!bDisInvalidate && rView.ImpIsGlueVisible()); /*?*/ /*?*/ if(bGlueInvalidate) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 rView.GlueInvalidate(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 rView.GlueInvalidate(); /*?*/ /*?*/ SdrObject* pLastGroup = GetAktGroup(); /*?*/ @@ -2278,7 +2278,7 @@ using namespace ::com::sun::star; /*?*/ InvalidateAllWin(); /*?*/ /*?*/ if(bGlueInvalidate) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 rView.GlueInvalidate(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 rView.GlueInvalidate(); /*N*/ } /*N*/ } @@ -2354,7 +2354,7 @@ using namespace ::com::sun::star; /*N*/ pGrp=pGrp->GetUpGroup(); /*N*/ } /*N*/ if (pGrp!=GetAktGroup()) { -/*?*/ if (pGrp!=NULL) {DBG_ASSERT(0, "STRIP"); }//STRIP001 EnterGroup(pGrp); +/*?*/ if (pGrp!=NULL) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 EnterGroup(pGrp); /*N*/ else LeaveAllGroup(); /*N*/ } /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx index afdc5fecb..7d7db956d 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdpntv.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2003-12-03 10:42:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -261,7 +261,7 @@ using namespace ::com::sun::star; //STRIP001 } /*N*/ IMPL_LINK(FrameAnimator,Hdl,AutoTimer*,pTim) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (rView.aDragStat.IsShown()) { //STRIP001 USHORT i=0; //STRIP001 do { @@ -614,7 +614,7 @@ using namespace ::com::sun::star; /*N*/ } /*N*/ #ifndef SVX_LIGHT /*N*/ if (pItemBrowser!=NULL) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete pItemBrowser; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete pItemBrowser; /*N*/ } /*N*/ #endif /*N*/ USHORT nAnz=ImpGetUserMarkerCount(); @@ -705,7 +705,7 @@ using namespace ::com::sun::star; //STRIP001 } /*?*/ void SdrPaintView::ImpAsyncPaintDone( const SdrObject* pObj ) -/*?*/ {{DBG_ASSERT(0, "STRIP");}//STRIP001 +/*?*/ {{DBG_BF_ASSERT(0, "STRIP");}//STRIP001 //STRIP001 // #110290# Remove the given object from the //STRIP001 // maSwappedInGraphicsStack list, as the object //STRIP001 // itself caters for swapout again. @@ -713,7 +713,7 @@ using namespace ::com::sun::star; /*?*/ } /*N*/ IMPL_LINK(SdrPaintView,ImpAfterPaintHdl,Timer*,pTimer) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 while( aAsyncPaintList.Count() ) //STRIP001 { //STRIP001 Rectangle aInvRect; @@ -790,7 +790,7 @@ using namespace ::com::sun::star; /*?*/ pPV->ModelHasChanged(); /*N*/ } /*N*/ #ifndef SVX_LIGHT -/*N*/ if (pItemBrowser!=NULL) {DBG_ASSERT(0, "STRIP"); }//STRIP001 pItemBrowser->SetDirty(); +/*N*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pItemBrowser->SetDirty(); /*N*/ #endif /*N*/ } @@ -801,7 +801,7 @@ using namespace ::com::sun::star; /*N*/ USHORT nAnz=ImpGetUserMarkerCount(); /*N*/ for (USHORT nNum=0; nNum<nAnz; nNum++) { /*N*/ SdrViewUserMarker* pUM=ImpGetUserMarker(nNum); -/*N*/ if (pUM->IsAnimate() && pUM->IsVisible()) {DBG_ASSERT(0, "STRIP");} //STRIP001 pUM->DoAnimateOneStep(); +/*N*/ if (pUM->IsAnimate() && pUM->IsVisible()) {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pUM->DoAnimateOneStep(); /*N*/ } /*N*/ return 0; /*N*/ } @@ -870,13 +870,13 @@ using namespace ::com::sun::star; /*N*/ void SdrPaintView::ToggleShownXor(OutputDevice* pOut, const Region* pRegion) const /*N*/ { -/*N*/ if (IsEncirclement() && aDragStat.IsShown()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (IsEncirclement() && aDragStat.IsShown()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ DrawEncirclement(pOut); /*N*/ } /*N*/ USHORT nAnz=ImpGetUserMarkerCount(); /*N*/ for (USHORT nNum=0; nNum<nAnz; nNum++) { /*N*/ SdrViewUserMarker* pUM=ImpGetUserMarker(nNum); -/*N*/ if (pUM->IsVisible()) {DBG_ASSERT(0, "STRIP");} //STRIP001 pUM->Draw(pOut,FALSE,!bRestoreColors); // den 3. Parameter hier noch richtig setzen !!!!! +/*N*/ if (pUM->IsVisible()) {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pUM->Draw(pOut,FALSE,!bRestoreColors); // den 3. Parameter hier noch richtig setzen !!!!! /*N*/ } /*N*/ } @@ -957,7 +957,7 @@ using namespace ::com::sun::star; /*N*/ void SdrPaintView::BrkEncirclement() /*N*/ { -/*N*/ if (IsEncirclement()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (IsEncirclement()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ HideEncirclement(pDragWin); //STRIP001 /*?*/ bEncircle=FALSE; /*N*/ } @@ -1053,7 +1053,7 @@ using namespace ::com::sun::star; /*N*/ void SdrPaintView::ClearAll() /*N*/ { /*N*/ for( void* p = aAsyncPaintList.First(); p; p = aAsyncPaintList.Next() ) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete (ImpAsyncStruct*) p; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete (ImpAsyncStruct*) p; /*N*/ /*N*/ aAsyncPaintList.Clear(); /*N*/ ClearPageViews(); @@ -1069,7 +1069,7 @@ using namespace ::com::sun::star; /*N*/ if (!bPageTwice) pTmpPV=GetPageView(pPage); // Evtl. jede Seite nur einmal! /*N*/ if (pTmpPV==NULL) { /*N*/ USHORT nPos=GetHiddenPV(pPage); // War die schon mal da? -/*N*/ if (nPos<GetPageHideCount()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (nPos<GetPageHideCount()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pPV=GetPageHidePvNum(nPos); //STRIP001 /*?*/ aPagHide.Remove(nPos); //STRIP001 /*?*/ pPV->SetOffset(rOffs); @@ -1233,7 +1233,7 @@ using namespace ::com::sun::star; /*?*/ GetPageViewPvNum(i)->AddWin(pWin1); /*N*/ } /*N*/ #ifndef SVX_LIGHT -/*N*/ if (pItemBrowser!=NULL) {DBG_ASSERT(0, "STRIP");} //STRIP001 pItemBrowser->ForceParent(); +/*N*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pItemBrowser->ForceParent(); /*N*/ #endif /*N*/ } @@ -1247,12 +1247,12 @@ using namespace ::com::sun::star; /*N*/ aWinList.Delete(nPos); /*N*/ } /*N*/ #ifndef SVX_LIGHT -/*N*/ if (pItemBrowser!=NULL) {DBG_ASSERT(0, "STRIP"); }//STRIP001 pItemBrowser->ForceParent(); +/*N*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pItemBrowser->ForceParent(); /*N*/ #endif /*N*/ } /*N*/ Rectangle SdrPaintView::GetVisibleArea( USHORT nNum ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return Rectangle();//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return Rectangle();//STRIP001 //STRIP001 OutputDevice* pWin = GetWin(nNum); //STRIP001 //STRIP001 if( pWin ) @@ -1411,7 +1411,7 @@ using namespace ::com::sun::star; //////////////////////////////////////////////////////////////////////////////////////////////////// /*N*/ void SdrPaintView::InitRedraw(OutputDevice* pOut, const Region& rReg, USHORT nPaintMode) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for (USHORT i=0; i<GetPageViewCount(); i++) { //STRIP001 SdrPageView* pPV=GetPageViewPvNum(i); //STRIP001 pPV->InitRedraw(pOut,rReg,nPaintMode,NULL); @@ -1641,7 +1641,7 @@ using namespace ::com::sun::star; //STRIP001 } /*N*/ void SdrPaintView::GlueInvalidate() const -/*N*/ {DBG_ASSERT(0, "STRIP"); +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nPvAnz=GetPageViewCount(); //STRIP001 USHORT nWinAnz=GetWinCount(); //STRIP001 for (USHORT nWinNum=0; nWinNum<nWinAnz; nWinNum++) { @@ -1840,7 +1840,7 @@ using namespace ::com::sun::star; /*?*/ } /*N*/ } #ifndef SVX_LIGHT -/*N*/ if (pItemBrowser!=NULL) {DBG_ASSERT(0, "STRIP"); }//STRIP001 pItemBrowser->SetDirty(); +/*N*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pItemBrowser->SetDirty(); #endif /*N*/ } @@ -1874,7 +1874,7 @@ using namespace ::com::sun::star; //STRIP001 } /*N*/ BOOL SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 SetDefaultStyleSheet(pStyleSheet,bDontRemoveHardAttr); //STRIP001 return TRUE; /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdsnpv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdsnpv.cxx index 4374ec0a6..f9bd95ed2 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdsnpv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdsnpv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdsnpv.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:29 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,10 +185,10 @@ namespace binfilter { /*N*/ void SdrSnapView::ToggleShownXor(OutputDevice* pOut, const Region* pRegion) const /*N*/ { /*N*/ SdrPaintView::ToggleShownXor(pOut,pRegion); -/*N*/ if (IsSetPageOrg()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (IsSetPageOrg()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ DrawSetPageOrg(pOut); /*N*/ } -/*N*/ if (IsDragHelpLine()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (IsDragHelpLine()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ DrawDragHelpLine(pOut); /*N*/ } /*N*/ } @@ -476,7 +476,7 @@ namespace binfilter { /*N*/ void SdrSnapView::BrkSetPageOrg() /*N*/ { -/*N*/ if (bSetPageOrg) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bSetPageOrg) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ HideSetPageOrg(pDragWin); //STRIP001 /*?*/ bSetPageOrg=FALSE; /*N*/ } @@ -630,7 +630,7 @@ namespace binfilter { /*N*/ void SdrSnapView::BrkDragHelpLine() /*N*/ { -/*N*/ if (bDragHelpLine) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bDragHelpLine) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ HideDragHelpLine(pDragWin); //STRIP001 /*?*/ bDragHelpLine=FALSE; //STRIP001 /*?*/ pDragHelpLinePV=NULL; diff --git a/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx b/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx index ef628a2f4..722c5eeef 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdsuro.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:29 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -139,7 +139,7 @@ namespace binfilter { /*N*/ SdrObjList* pL=pList->GetUpList(); /*N*/ nGrpLevel=0; /*N*/ while (pL!=NULL) { pL=pL->GetUpList(); nGrpLevel++; } -/*N*/ if (nGrpLevel!=0) { DBG_ASSERT(0, "STRIP"); //STRIP001 // Aha, verschachtelt +/*N*/ if (nGrpLevel!=0) { DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Aha, verschachtelt //STRIP001 /*?*/ pGrpOrdNums=new UINT32[nGrpLevel]; //STRIP001 /*?*/ const SdrObjList* pL=pRootList; //STRIP001 /*?*/ for (unsigned i=nGrpLevel; i>0;) { diff --git a/binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx b/binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx index ba0a15ef3..893cf9d87 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdtrans.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:30 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -871,7 +871,7 @@ namespace binfilter { /*?*/ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD) /*?*/ { /*?*/ if (eS==eD) return FrPair(1,1,1,1); -/*?*/ {DBG_ASSERT(0, "STRIP");}return FrPair(1,1,1,1);//STRIP001 //STRIP001 /*?*/ FrPair aS(GetInchOrMM(eS)); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");}return FrPair(1,1,1,1);//STRIP001 //STRIP001 /*?*/ FrPair aS(GetInchOrMM(eS)); //STRIP001 /*?*/ FrPair aD(GetInchOrMM(eD)); //STRIP001 /*?*/ FASTBOOL bSInch=IsInch(eS); //STRIP001 /*?*/ FASTBOOL bDInch=IsInch(eD); diff --git a/binfilter/bf_svx/source/svdraw/svx_svdundo.cxx b/binfilter/bf_svx/source/svdraw/svx_svdundo.cxx index c47fcd90c..8fb54c9f4 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdundo.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdundo.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdundo.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:30 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -742,7 +742,7 @@ namespace binfilter { /*N*/ if (pObj!=NULL && IsOwner()) /*N*/ { /*N*/ // Attribute muessen wieder in den regulaeren Pool -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SetOwner(FALSE); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetOwner(FALSE); /*?*/ /*?*/ // nun loeschen //STRIP001 /*?*/ delete pObj; diff --git a/binfilter/bf_svx/source/svdraw/svx_svdview.cxx b/binfilter/bf_svx/source/svdraw/svx_svdview.cxx index 8dddbce14..a1949d4ce 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdview.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdview.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:30 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -394,7 +394,7 @@ namespace binfilter { /*?*/ } /*N*/ } /*N*/ -/*N*/ if (bDeep || bMid || bRoot) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (bDeep || bMid || bRoot) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ Point aP(aPnt); //STRIP001 /*?*/ aP-=pPV->GetOffset(); //STRIP001 /*?*/ SdrObjMacroHitRec aHitRec; @@ -560,7 +560,7 @@ namespace binfilter { /*N*/ } else if (eHit==SDRHIT_GLUEPOINT) { /*N*/ eEvent=SDREVENT_MARKGLUEPOINT; // AddMark+Drag /*N*/ rVEvt.bAddMark=MODKEY_MultiMark || MODKEY_DeepMark; // falls bei Deep nicht getroffen -/*N*/ } else if (eHit==SDRHIT_HANDLE) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ } else if (eHit==SDRHIT_HANDLE) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark //STRIP001 /*?*/ BOOL bGlue=pHdl->GetKind()==HDL_GLUE; //STRIP001 /*?*/ BOOL bPoly=!bGlue && IsPointMarkable(*pHdl); @@ -846,13 +846,13 @@ namespace binfilter {//STRIP009 /*?*/ return pAktCreate->GetCreatePointer(); /*?*/ } /*N*/ } -/*N*/ if (pDragBla!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pDragBla!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if ((IsDraggingPoints() || IsDraggingGluePoints()) && IsMouseHideWhileDraggingPoints()) return Pointer(POINTER_NULL); //STRIP001 /*?*/ return pDragBla->GetPointer(); /*N*/ } /*N*/ if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsEncirclement() || IsSetPageOrg()) return Pointer(POINTER_ARROW); -/*N*/ if (IsDragHelpLine()) {DBG_ASSERT(0, "STRIP"); }//STRIP001 return GetDraggedHelpLine().GetPointer(); -/*N*/ if (IsMacroObj()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (IsDragHelpLine()) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 return GetDraggedHelpLine().GetPointer(); +/*N*/ if (IsMacroObj()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrObjMacroHitRec aHitRec; //STRIP001 /*?*/ aHitRec.aPos=pOut->LogicToPixel(rMousePos); //STRIP001 /*?*/ aHitRec.aDownPos=aMacroDownPos; @@ -867,7 +867,7 @@ namespace binfilter {//STRIP009 /*N*/ // TextEdit, ObjEdit, Macro /*N*/ if (IsTextEdit() && (IsTextEditInSelectionMode() || IsTextEditHit(rMousePos,0/*nTol*/))) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if(!pOut || IsTextEditInSelectionMode()) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if(!pOut || IsTextEditInSelectionMode()) //STRIP001 /*?*/ { //STRIP001 /*?*/ if(pTextEditOutliner->IsVertical()) //STRIP001 /*?*/ return Pointer(POINTER_TEXT_VERTICAL); @@ -900,7 +900,7 @@ namespace binfilter {//STRIP009 /*N*/ case SDREVENT_MARKPOINT: case SDREVENT_MARKGLUEPOINT: return Pointer(POINTER_MOVEPOINT); /*N*/ case SDREVENT_BEGINSOBJPOINT: case SDREVENT_BEGINSGLUEPOINT: return Pointer(POINTER_CROSS); /*N*/ case SDREVENT_EXECUTEURL: return Pointer(POINTER_REFHAND); -/*N*/ case SDREVENT_BEGMACROOBJ: {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ case SDREVENT_BEGMACROOBJ: {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrObjMacroHitRec aHitRec; //STRIP001 /*?*/ aHitRec.aPos=aVEvt.aLogicPos; //STRIP001 /*?*/ aHitRec.aDownPos=aHitRec.aPos; @@ -915,7 +915,7 @@ namespace binfilter {//STRIP009 /*N*/ switch(eHit) /*N*/ { /*N*/ case SDRHIT_HELPLINE : -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 return aVEvt.pPV->GetHelpLines()[aVEvt.nHlplIdx].GetPointer(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 return aVEvt.pPV->GetHelpLines()[aVEvt.nHlplIdx].GetPointer(); /*N*/ case SDRHIT_GLUEPOINT: /*N*/ return Pointer(POINTER_MOVEPOINT); /*N*/ case SDRHIT_TEXTEDIT : @@ -938,7 +938,7 @@ namespace binfilter {//STRIP009 /*?*/ BOOL bMarkHit=eHit==SDRHIT_MARKEDOBJECT; /*?*/ SdrHdl* pHdl=aVEvt.pHdl; /*?*/ // Nun die Pointer fuer Dragging checken -/*?*/ if (pHdl!=NULL || bMarkHit) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ if (pHdl!=NULL || bMarkHit) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SdrHdlKind eHdl= pHdl!=NULL ? pHdl->GetKind() : HDL_MOVE; //STRIP001 /*?*/ BOOL bCorner=pHdl!=NULL && pHdl->IsCornerHdl(); //STRIP001 /*?*/ BOOL bVertex=pHdl!=NULL && pHdl->IsVertexHdl(); @@ -1049,7 +1049,7 @@ namespace binfilter {//STRIP009 /*N*/ /*N*/ aStr.AppendAscii("nix"); /*N*/ -/*N*/ if (pAktCreate!=NULL) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ if (pAktCreate!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aStr=pAktCreate->GetDragComment(aDragStat,FALSE,TRUE); //STRIP001 /*?*/ //STRIP001 /*?*/ if(!aStr.Len()) @@ -1060,19 +1060,19 @@ namespace binfilter {//STRIP009 /*N*/ } else if (pDragBla!=NULL) { /*?*/ if (bInsPolyPoint || IsInsertGluePoint()) { /*?*/ aStr=aInsPointUndoStr; -/*N*/ } else {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ } else {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if (aDragStat.IsMinMoved()) { //STRIP001 /*?*/ pDragBla->TakeComment(aStr); //STRIP001 /*?*/ } /*N*/ } /*N*/ } else if (bMarking) { -/*?*/ if (HasMarkedObj()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ if (HasMarkedObj()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aStr=ImpGetResStr(STR_ViewMarkMoreObjs); -/*?*/ } else {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ } else {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aStr=ImpGetResStr(STR_ViewMarkObjs); /*N*/ } /*N*/ } else if (bMarkingPoints) { -/*?*/ if (HasMarkedPoints()) {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ if (HasMarkedPoints()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aStr=ImpGetResStr(STR_ViewMarkMorePoints); /*N*/ } else { /*N*/ aStr=ImpGetResStr(STR_ViewMarkPoints); @@ -1118,7 +1118,7 @@ namespace binfilter {//STRIP009 /*N*/ if(aStr.EqualsAscii("nix")) /*N*/ { /*?*/ if (HasMarkedObj()) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImpTakeDescriptionStr(STR_ViewMarked,aStr); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImpTakeDescriptionStr(STR_ViewMarked,aStr); //STRIP001 /*?*/ if (IsGluePointEditMode()) { //STRIP001 /*?*/ if (HasMarkedGluePoints()) { //STRIP001 /*?*/ ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,IMPSDR_GLUEPOINTSDESCRIPTION); @@ -1206,10 +1206,10 @@ namespace binfilter {//STRIP009 /*?*/ eSel.nStartPos=eSel.nEndPos; /*?*/ GetTextEditOutlinerView()->SetSelection(eSel); /*?*/ #ifndef SVX_LIGHT -/*?*/ if (pItemBrowser!=NULL) {DBG_ASSERT(0, "STRIP");} //STRIP001 pItemBrowser->SetDirty(); +/*?*/ if (pItemBrowser!=NULL) {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pItemBrowser->SetDirty(); /*?*/ #endif /*N*/ } else if (HasMarkedGluePoints()) UnmarkAllGluePoints(); -/*N*/ else if (HasMarkedPoints()) {DBG_ASSERT(0, "STRIP"); }//STRIP001 UnmarkAllPoints(); // ! Marked statt Markable ! +/*N*/ else if (HasMarkedPoints()) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 UnmarkAllPoints(); // ! Marked statt Markable ! /*N*/ else UnmarkAllObj(); /*N*/ } @@ -1317,7 +1317,7 @@ namespace binfilter {//STRIP009 //STRIP001 } /*N*/ void SdrView::DeleteMarked() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (IsTextEdit()) { //STRIP001 SdrObjEditView::KeyInput(KeyEvent(0,KeyCode(KEYFUNC_DELETE)),pTextEditWin); //STRIP001 } else { diff --git a/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx b/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx index 8429a9a9c..a37557320 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdvmark.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:46 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ namespace binfilter { /*N*/ /*N*/ SdrViewUserMarker::~SdrViewUserMarker() /*N*/ { -/*N*/ if (bVisible) {DBG_ASSERT(0, "STRIP"); }//STRIP001 Hide(); +/*N*/ if (bVisible) {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 Hide(); /*N*/ if (pView!=NULL) pView->ImpRemoveUserMarker(this); /*N*/ ImpDelGeometrics(); /*N*/ } @@ -368,7 +368,7 @@ namespace binfilter { //STRIP001 } /*N*/ void SdrViewUserMarker::Show() -/*N*/ {DBG_ASSERT(0, "STRIP"); +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (!bVisible) { //STRIP001 nAnimateDelayCountDown=nAnimateDelay; //STRIP001 if (nAnimateDelay!=0) { @@ -382,7 +382,7 @@ namespace binfilter { /*N*/ } /*N*/ void SdrViewUserMarker::Hide() -/*N*/ {DBG_ASSERT(0, "STRIP"); +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (bVisible) { //STRIP001 ImpDraw(TRUE,FALSE); //STRIP001 bVisible=FALSE; diff --git a/binfilter/bf_svx/source/svdraw/svx_svdxcgv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdxcgv.cxx index fe76d09b6..be17b0942 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdxcgv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdxcgv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_svdxcgv.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:46:31 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -552,7 +552,7 @@ namespace binfilter { //STRIP001 // ----------------------------------------------------------------------------- //STRIP001 /*?*/ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked ) const -/*?*/ {DBG_ASSERT(0, "STRIP"); GDIMetaFile aMtf; return aMtf;//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); GDIMetaFile aMtf; return aMtf;//STRIP001 //STRIP001 GDIMetaFile aMtf; //STRIP001 //STRIP001 if( HasMarkedObj() ) diff --git a/binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx b/binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx index 25f661c94..ba27e92a8 100644 --- a/binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx +++ b/binfilter/bf_svx/source/svxlink/svx_linkmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_linkmgr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:02 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,7 +151,7 @@ namespace binfilter { /*N*/ return new SvFileObject; /*N*/ /*N*/ case OBJECT_INTERN: -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 return new SvxInternalLink(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 return new SvxInternalLink(); /*N*/ } /*?*/ return SvLinkManager::CreateObj( pLink ); /*N*/ } diff --git a/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx index f8712f276..9fd449f81 100644 --- a/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx +++ b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_unoctabl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:14 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -179,7 +179,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno:: void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) -{DBG_ASSERT(0, "STRIP");//STRIP001 +{DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 long nIndex = pTable ? ((XPropertyTable*)pTable)->Get( Name ) : -1; //STRIP001 if( nIndex == -1 ) //STRIP001 throw container::NoSuchElementException(); @@ -206,7 +206,7 @@ void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno: // XNameAccess uno::Any SAL_CALL SvxUnoColorTable::getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) -{DBG_ASSERT(0, "STRIP"); uno::Any aAny; return aAny;//STRIP001 +{DBG_BF_ASSERT(0, "STRIP"); uno::Any aAny; return aAny;//STRIP001 //STRIP001 long nIndex = pTable ? ((XPropertyTable*)pTable)->Get( aName ) : -1; //STRIP001 if( nIndex == -1 ) //STRIP001 throw container::NoSuchElementException(); @@ -226,7 +226,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames( ) OUString* pStrings = aSeq.getArray(); for( long nIndex = 0; nIndex < nCount; nIndex++ ) - {DBG_ASSERT(0, "STRIP");//STRIP001 + {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 XColorEntry* pEntry = pTable->Get( nIndex ); //STRIP001 pStrings[nIndex] = pEntry->GetName(); } diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx index b5fdebcee..1ea3d4f96 100644 --- a/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx +++ b/binfilter/bf_svx/source/unodraw/svx_unoshape.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_unoshape.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:18 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2318,7 +2318,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) break; } case OWN_ATTR_LDBITMAP: - { DBG_ASSERT(0, "STRIP"); // Discussed with DL, this is not needed. Thus the bitmaps may be removed again, too. + { DBG_BF_ASSERT(0, "STRIP"); // Discussed with DL, this is not needed. Thus the bitmaps may be removed again, too. //STRIP003 sal_uInt16 nId; //STRIP003 if( pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2 ) //STRIP003 { diff --git a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx index 64de92bea..768532b19 100644 --- a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx +++ b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xmleohlp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ + * last change: $Author: rt $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -173,28 +173,28 @@ public: /*?*/ sal_Int32 nMaxBytesToRead) /*?*/ throw(NotConnectedException, BufferSizeExceededException, RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 MutexGuard aGuard( maMutex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 MutexGuard aGuard( maMutex ); //STRIP001 return xIn->readSomeBytes( aData, nMaxBytesToRead ); /*?*/ } /*?*/ void SAL_CALL InputStorageWrapper_Impl::skipBytes( sal_Int32 nBytesToSkip ) /*?*/ throw(NotConnectedException, BufferSizeExceededException, RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 MutexGuard aGuard( maMutex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 MutexGuard aGuard( maMutex ); //STRIP001 xIn->skipBytes( nBytesToSkip ); /*?*/ } /*?*/ sal_Int32 SAL_CALL InputStorageWrapper_Impl::available() /*?*/ throw(NotConnectedException, RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 MutexGuard aGuard( maMutex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 MutexGuard aGuard( maMutex ); //STRIP001 return xIn->available(); /*?*/ } /*?*/ void SAL_CALL InputStorageWrapper_Impl::closeInput() /*?*/ throw(NotConnectedException, RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 MutexGuard aGuard( maMutex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 MutexGuard aGuard( maMutex ); //STRIP001 xIn->closeInput(); //STRIP001 xIn = 0; //STRIP001 xStor = 0; @@ -267,7 +267,7 @@ public: /*?*/ void SAL_CALL OutputStorageWrapper_Impl::flush() /*?*/ throw(NotConnectedException, BufferSizeExceededException, RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 MutexGuard aGuard( maMutex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 MutexGuard aGuard( maMutex ); //STRIP001 xOut->flush(); /*?*/ } @@ -762,14 +762,14 @@ struct OUStringLess /*?*/ Sequence< OUString > SAL_CALL SvXMLEmbeddedObjectHelper::getElementNames() /*?*/ throw (RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); Sequence< OUString > aSeq; return aSeq;//STRIP001 MutexGuard aGuard( maMutex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); Sequence< OUString > aSeq; return aSeq;//STRIP001 MutexGuard aGuard( maMutex ); //STRIP001 return Sequence< OUString >(0); /*?*/ } /*?*/ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr ) /*?*/ throw (RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 MutexGuard aGuard( maMutex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 MutexGuard aGuard( maMutex ); //STRIP001 if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode ) //STRIP001 { //STRIP001 return sal_True; @@ -791,7 +791,7 @@ struct OUStringLess /*?*/ Type SAL_CALL SvXMLEmbeddedObjectHelper::getElementType() /*?*/ throw (RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); Type aType; return aType;//STRIP001 MutexGuard aGuard( maMutex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); Type aType; return aType;//STRIP001 MutexGuard aGuard( maMutex ); //STRIP001 if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode ) //STRIP001 return ::getCppuType((const Reference<XOutputStream>*)0); //STRIP001 else @@ -801,7 +801,7 @@ struct OUStringLess /*?*/ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasElements() /*?*/ throw (RuntimeException) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 MutexGuard aGuard( maMutex ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 MutexGuard aGuard( maMutex ); //STRIP001 if( EMBEDDEDOBJECTHELPER_MODE_READ == meCreateMode ) //STRIP001 { //STRIP001 return sal_True; diff --git a/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx b/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx index a63194f26..1ccc0f8e0 100644 --- a/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx +++ b/binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xmlgrhlp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ + * last change: $Author: rt $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -193,7 +193,7 @@ public: /*?*/ sal_Int32 SAL_CALL SvXMLGraphicInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) /*?*/ throw( NotConnectedException, BufferSizeExceededException, RuntimeException ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 if( !mxStmWrapper.is() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 if( !mxStmWrapper.is() ) //STRIP001 throw NotConnectedException() ; //STRIP001 //STRIP001 return mxStmWrapper->readSomeBytes( rData, nMaxBytesToRead ); @@ -204,7 +204,7 @@ public: /*?*/ void SAL_CALL SvXMLGraphicInputStream::skipBytes( sal_Int32 nBytesToSkip ) /*?*/ throw( NotConnectedException, BufferSizeExceededException, RuntimeException ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( !mxStmWrapper.is() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( !mxStmWrapper.is() ) //STRIP001 throw NotConnectedException() ; //STRIP001 //STRIP001 mxStmWrapper->skipBytes( nBytesToSkip ); @@ -214,7 +214,7 @@ public: /*?*/ sal_Int32 SAL_CALL SvXMLGraphicInputStream::available() throw( NotConnectedException, RuntimeException ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 if( !mxStmWrapper.is() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 if( !mxStmWrapper.is() ) //STRIP001 throw NotConnectedException() ; //STRIP001 //STRIP001 return mxStmWrapper->available(); @@ -224,7 +224,7 @@ public: /*?*/ void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException, RuntimeException ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( !mxStmWrapper.is() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( !mxStmWrapper.is() ) //STRIP001 throw NotConnectedException() ; //STRIP001 //STRIP001 mxStmWrapper->closeInput(); @@ -302,7 +302,7 @@ public: /*?*/ void SAL_CALL SvXMLGraphicOutputStream::flush() /*?*/ throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( !mxStmWrapper.is() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( !mxStmWrapper.is() ) //STRIP001 throw NotConnectedException() ; //STRIP001 //STRIP001 mxStmWrapper->flush(); diff --git a/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx b/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx index 062a3f832..3884044e7 100644 --- a/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx__xfont.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:47 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -587,7 +587,7 @@ using namespace ::com::sun::star::i18n; /*?*/ aFont.SetOrientation(nAngle); /*?*/ pOut->SetFont(aFont); /*?*/ if(bDraw) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ImpDrawTextArray(pOut, aPos, pInfo, (long*)pDXArray, nChar, nCnt); /*?*/ } /*N*/ } @@ -600,7 +600,7 @@ using namespace ::com::sun::star::i18n; /*N*/ pOut->SetFont(aFont); /*N*/ if(bDraw) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImpDrawTextArray(pOut, aPos, pInfo, (long*)pDXArray, nChar, nCnt); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImpDrawTextArray(pOut, aPos, pInfo, (long*)pDXArray, nChar, nCnt); /*N*/ } /*N*/ } /*N*/ } @@ -649,7 +649,7 @@ using namespace ::com::sun::star::i18n; /*?*/ PolyPolygon aPolyPoly(aPolyPolyVector[a]); /*?*/ /*?*/ if(aPolyPoly.Count() > 0 && aPolyPoly[0].GetSize() > 0) -/*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 /*?*/ // #103163# Create in-between XPolxPolygon //STRIP001 /*?*/ XPolyPolygon aNextChar(aPolyPoly); //STRIP001 /*?*/ @@ -670,7 +670,7 @@ using namespace ::com::sun::star::i18n; /*?*/ } /*?*/ /*?*/ if ( eFormTextStyle == XFT_SLANTY ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aPolyPos.Y() -= nAscent; //STRIP001 /*?*/ aChar.SlantY(0, fSin, fCos); /*?*/ } @@ -699,7 +699,7 @@ using namespace ::com::sun::star::i18n; /*?*/ DrawXPolyPolygon(aChar); /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ImpDrawTextArray(pOut, aPolyPos, pInfo, (long*)pDXArray, nChar + i, nNextGlyphLen); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ImpDrawTextArray(pOut, aPolyPos, pInfo, (long*)pDXArray, nChar + i, nNextGlyphLen); /*?*/ } /*?*/ } /*?*/ diff --git a/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx b/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx index d5f09c73c..fd17824ee 100644 --- a/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx__ximp.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:47 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -230,7 +230,7 @@ namespace binfilter { /*?*/ if( pMtf && !bPrinter ) /*?*/ { /*?*/ if( !pOut->GetPDFWriter() && XIMP_bDrawRasterOps ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pOut->SetRasterOp( ROP_XOR ); //STRIP001 /*?*/ ImpDrawBitmapFill( aPolyRect, bPrinter ); //STRIP001 /*?*/ @@ -244,18 +244,18 @@ namespace binfilter { //STRIP001 /*?*/ ImpDrawBitmapFill( aPolyRect, bPrinter ); /*?*/ } /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pOut->IntersectClipRegion( rPolyPoly ); //STRIP001 /*?*/ ImpDrawBitmapFill( aPolyRect, bPrinter ); /*?*/ } /*?*/ } /*?*/ else if( bRect || bPrinter ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pOut->IntersectClipRegion( rPolyPoly ); //STRIP001 /*?*/ ImpDrawBitmapFill( aPolyRect, bPrinter ); /*?*/ } /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ VirtualDevice aMemDev; //STRIP001 /*?*/ PolyPolygon aPolyPoly( pOut->LogicToPixel( rPolyPoly ) ); //STRIP001 /*?*/ Rectangle aPolyRectPix( pOut->LogicToPixel( aPolyRect ) ); diff --git a/binfilter/bf_svx/source/xoutdev/svx__xoutbmp.cxx b/binfilter/bf_svx/source/xoutdev/svx__xoutbmp.cxx index cb8c75696..218e9ea71 100644 --- a/binfilter/bf_svx/source/xoutdev/svx__xoutbmp.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx__xoutbmp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx__xoutbmp.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:48 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -531,7 +531,7 @@ GraphicFilter* XOutBitmap::pGrfFilter = NULL; /*N*/ GraphicFilter& rFilter, const USHORT nFormat, /*N*/ BOOL bIgnoreOptions, /*N*/ const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 #ifndef SVX_LIGHT //STRIP001 DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" ); //STRIP001 diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx index accd161ab..385f8d826 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xattrbmp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xattrbmp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:38 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -528,7 +528,7 @@ namespace binfilter { /*?*/ /*?*/ if( aBmp.GetSizePixel().Width() == 8 && /*?*/ aBmp.GetSizePixel().Height() == 8 ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aXOBitmap.SetBitmapType( XBITMAP_8X8 ); //STRIP001 /*?*/ aXOBitmap.Bitmap2Array(); /*?*/ } @@ -820,7 +820,7 @@ namespace binfilter { /*?*/ if(aInput.GetSizePixel().Width() == 8 /*?*/ && aInput.GetSizePixel().Height() == 8 /*?*/ && aInput.GetColorCount() == 2) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aXOBitmap.Bitmap2Array(); //STRIP001 /*?*/ aXOBitmap.SetBitmapType(XBITMAP_8X8); //STRIP001 /*?*/ aXOBitmap.SetPixelSize(aInput.GetSizePixel()); diff --git a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx index aaec43971..31a731900 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xline.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:48 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1087,7 +1087,7 @@ namespace binfilter { /*N*/ if( nPntMax >= 1 ) /*N*/ { /*N*/ if( bHair || ( ( XLINE_SOLID == eLineStyle ) && ( nLineWidth == 0 ) ) ) -/*N*/ {{DBG_ASSERT(0, "STRIP"); }//STRIP001 +/*N*/ {{DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 //STRIP001 /*?*/ // #107240# //STRIP001 /*?*/ // Since this method is also used for XOR drawing it's not allowed //STRIP001 /*?*/ // to optimize to line drawing here. DrawLine() does not draw the @@ -1210,7 +1210,7 @@ namespace binfilter { /*?*/ nPntMax--; /*?*/ aLParam.Init(aPoly[nPntMax], aPoly[i], nLineWidth); /*?*/ if ( nLineWidth > 0 ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 CalcFatLineJoin(aPoly[i], aPoly[i+1], aLParam); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 CalcFatLineJoin(aPoly[i], aPoly[i+1], aLParam); /*?*/ } /*?*/ else /*?*/ aLParam.Init(aPoly[i], aPoly[i+1], nLineWidth); @@ -1230,9 +1230,9 @@ namespace binfilter { /*?*/ else pNextPoint = NULL; /*?*/ /*?*/ if ( nLineWidth > 0 ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 DrawFatLine(aPoly[i], aPoly[i+1], pNextPoint, aLParam); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 DrawFatLine(aPoly[i], aPoly[i+1], pNextPoint, aLParam); /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aLParam.nLineDx = aPoly[i+1].X() - aPoly[i].X(); //STRIP001 /*?*/ aLParam.nLineDy = aPoly[i+1].Y() - aPoly[i].Y(); //STRIP001 /*?*/ aLParam.fLength = sqrt((double) aLParam.nLineDx * aLParam.nLineDx + @@ -1244,9 +1244,9 @@ namespace binfilter { /*?*/ if ( bClosePoly ) /*?*/ { /*?*/ if ( nLineWidth > 0 ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 DrawFatLine(aPoly[i], aPoly[0], &aPoly[1], aLParam); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 DrawFatLine(aPoly[i], aPoly[0], &aPoly[1], aLParam); /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aLParam.nLineDx = aPoly[0].X() - aPoly[i].X(); //STRIP001 /*?*/ aLParam.nLineDy = aPoly[0].Y() - aPoly[i].Y(); //STRIP001 /*?*/ aLParam.fLength = sqrt((double) aLParam.nLineDx * aLParam.nLineDx + @@ -1257,9 +1257,9 @@ namespace binfilter { /*?*/ else /*?*/ { /*?*/ if ( bLineStart ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 DrawStartEndPoly(aLineStartPos, aLineStartPoly, aStartParam); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 DrawStartEndPoly(aLineStartPos, aLineStartPoly, aStartParam); /*?*/ if ( bLineEnd ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 DrawStartEndPoly(aLineEndPos, aLineEndPoly, aEndParam); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 DrawStartEndPoly(aLineEndPos, aLineEndPoly, aEndParam); /*?*/ } /*?*/ /*?*/ if( nLineWidth == 0 ) diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx index 913b878a8..aa7871114 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xtabbtmp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -393,7 +393,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0 /************************************************************************/ /*N*/ BOOL XBitmapList::Save() -/*N*/ {DBG_ASSERT(0, "STRIP"); return false;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false;//STRIP001 //STRIP001 #ifndef SVX_LIGHT //STRIP001 //STRIP001 INetURLObject aURL( aPath ); diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx index ce653188c..b573ae8c1 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xtabcolr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -212,7 +212,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 /************************************************************************/ /*N*/ BOOL XColorTable::Save() -/*N*/ {DBG_ASSERT(0, "STRIP"); return false; +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false; //STRIP001 #ifndef SVX_LIGHT //STRIP001 INetURLObject aURL( aPath ); //STRIP001 diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx index 465f35958..0921d5fb5 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xtabdash.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -408,7 +408,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 /************************************************************************/ /*N*/ BOOL XDashList::Save() -/*N*/ {DBG_ASSERT(0, "STRIP"); return false; +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false; //STRIP001 #ifndef SVX_LIGHT //STRIP001 INetURLObject aURL( aPath ); //STRIP001 diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx index 634b23a1d..d59d6c0c6 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xtabgrdt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -420,7 +420,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 /************************************************************************/ /*N*/ BOOL XGradientList::Save() -/*N*/ {DBG_ASSERT(0, "STRIP"); return false; +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false; //STRIP001 #ifndef SVX_LIGHT //STRIP001 INetURLObject aURL( aPath ); //STRIP001 diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx index 68929a6a1..719ec6e5d 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xtabhtch.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -402,7 +402,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 /************************************************************************/ /*N*/ BOOL XHatchList::Save() -/*N*/ {DBG_ASSERT(0, "STRIP"); return false; +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false; //STRIP001 #ifndef SVX_LIGHT //STRIP001 INetURLObject aURL( aPath ); //STRIP001 diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx index 367b422d5..ecd7b7e9a 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svx_xtablend.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:47:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -465,7 +465,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 /************************************************************************/ /*N*/ BOOL XLineEndList::Save() -/*N*/ {DBG_ASSERT(0, "STRIP"); return false; +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return false; //STRIP001 #ifndef SVX_LIGHT //STRIP001 INetURLObject aURL( aPath ); //STRIP001 diff --git a/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx b/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx index 0f694a13b..3f4c74183 100644 --- a/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx +++ b/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_cellatr.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,7 +138,7 @@ namespace binfilter { /*N*/ int SwTblBoxFormula::operator==( const SfxPoolItem& rAttr ) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); //STRIP001 /*?*/ return GetFormula() == ((SwTblBoxFormula&)rAttr).GetFormula() && //STRIP001 /*?*/ pDefinedIn == ((SwTblBoxFormula&)rAttr).pDefinedIn; /*N*/ } @@ -146,7 +146,7 @@ namespace binfilter { /*N*/ SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 // auf externe Darstellung umschalten!! +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 // auf externe Darstellung umschalten!! //STRIP001 SwTblBoxFormula* pNew = new SwTblBoxFormula( GetFormula() ); //STRIP001 pNew->SwTableFormula::operator=( *this ); //STRIP001 return pNew; @@ -160,7 +160,7 @@ namespace binfilter { // !!! MUSS VON JEDER ABLEITUNG UEBERLADEN WERDEN !!! /*N*/ const SwNode* SwTblBoxFormula::GetNodeOfFormula() const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 const SwNode* pRet = 0; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 const SwNode* pRet = 0; //STRIP001 if( pDefinedIn ) //STRIP001 { //STRIP001 SwClient* pBox = SwClientIter( *pDefinedIn ).First( TYPE( SwTableBox )); diff --git a/binfilter/bf_sw/source/core/attr/sw_format.cxx b/binfilter/bf_sw/source/core/attr/sw_format.cxx index 9e9f22a16..218f6415f 100644 --- a/binfilter/bf_sw/source/core/attr/sw_format.cxx +++ b/binfilter/bf_sw/source/core/attr/sw_format.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_format.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -657,7 +657,7 @@ namespace binfilter { /*N*/ void SwFmt::DelDiffs( const SfxItemSet& rSet ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if( !aSet.Count() ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( !aSet.Count() ) //STRIP001 return; //STRIP001 //STRIP001 if ( IsInCache() ) diff --git a/binfilter/bf_sw/source/core/attr/sw_swatrset.cxx b/binfilter/bf_sw/source/core/attr/sw_swatrset.cxx index d5f79a39f..56bf5e648 100644 --- a/binfilter/bf_sw/source/core/attr/sw_swatrset.cxx +++ b/binfilter/bf_sw/source/core/attr/sw_swatrset.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swatrset.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -283,7 +283,7 @@ namespace binfilter { /*N*/ if( SFX_ITEM_SET == GetItemState( RES_BOXATR_FORMULA, FALSE, &pItem ) && /*N*/ ((SwTblBoxFormula*)pItem)->GetDefinedIn() != pModify ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwTblBoxFormula*)pItem)->ChgDefinedIn( pModify ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwTblBoxFormula*)pItem)->ChgDefinedIn( pModify ); /*N*/ } /*N*/ } diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx index ba84feaf9..68f3f8f84 100644 --- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx +++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_calc.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-05-04 14:32:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -671,7 +671,7 @@ static int /*N*/ String sTableName(sDBName.GetToken(0).GetToken(1, DB_DELIM)); /*N*/ if( pMgr && sSourceName.Len() && sTableName.Len() && /*N*/ pMgr->OpenDataSource(sSourceName, sTableName)) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ String sColumnName( GetColumnName( sTmpName )); //STRIP001 /*?*/ ASSERT (sColumnName.Len(), "DB-Spaltenname fehlt!"); //STRIP001 /*?*/ @@ -1088,7 +1088,7 @@ static int /*M*/ case '0': case '1': case '2': case '3': case '4': /*M*/ case '5': case '6': case '7': case '8': case '9': /*M*/ case ',': -/*M*/ case '.': {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ case '.': {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ double nVal; //STRIP001 /*?*/ --nCommandPos; // auf das 1. Zeichen zurueck //STRIP001 /*?*/ if( Str2Double( sCommand, nCommandPos, nVal, pLclData )) diff --git a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx index 07fdb9f73..746bb14c7 100644 --- a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx +++ b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_index.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:24:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -451,7 +451,7 @@ int SwIndex::nSerial = 0; #ifndef CFRONT -xub_StrLen SwIndex::operator++(int) {DBG_ASSERT(0, "STRIP"); return 0;} //STRIP001 INLINE xub_StrLen operator++(int); +xub_StrLen SwIndex::operator++(int) {DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 INLINE xub_StrLen operator++(int); //STRIP001 { //STRIP001 ASSERT_ID( nIndex < INVALID_INDEX, ERR_OUTOFSCOPE ); //STRIP001 @@ -463,7 +463,7 @@ xub_StrLen SwIndex::operator++(int) {DBG_ASSERT(0, "STRIP"); return 0;} //STRIP0 #endif -xub_StrLen SwIndex::operator++() {DBG_ASSERT(0, "STRIP"); return 0;} //STRIP001 INLINE xub_StrLen operator++(int); +xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 INLINE xub_StrLen operator++(int); //STRIP001 { //STRIP001 ASSERT_ID( nIndex < INVALID_INDEX, ERR_OUTOFSCOPE ); //STRIP001 diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx index d1b166f9f..eaa5cff77 100644 --- a/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx +++ b/binfilter/bf_sw/source/core/bastyp/sw_swrect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swrect.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -357,7 +357,7 @@ namespace binfilter { /*N*/ SvStream &operator<<( SvStream &rStream, const SwRect &rRect ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 rStream << '[' << rRect.Top() << '/' << rRect.Left() +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 rStream << '[' << rRect.Top() << '/' << rRect.Left() //STRIP001 << ',' << rRect.Width() << 'x' << rRect.Height() << "] "; /*N*/ return rStream; /*N*/ } diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx index b7c338366..f2be214b5 100644 --- a/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx +++ b/binfilter/bf_sw/source/core/bastyp/sw_swtypes.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swtypes.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,7 +237,7 @@ IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos, 20, 20 ) /*N*/ Locale CreateLocale( LanguageType eLanguage ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); Locale temp; return temp;//STRIP001 String aLangStr, aCtryStr; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); Locale temp; return temp;//STRIP001 String aLangStr, aCtryStr; //STRIP001 if (LANGUAGE_NONE != eLanguage) //STRIP001 ConvertLanguageToIsoNames( eLanguage, aLangStr, aCtryStr ); //STRIP001 diff --git a/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx b/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx index d4be65d91..745f22edc 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_bookmrk.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:20 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,7 +122,7 @@ namespace binfilter { /*N*/ // Clipboard ausgetragen werden. Wird automatisch ueber DataChanged /*N*/ // ausgeloest. /*N*/ if( refObj.Is() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( DDE_BOOKMARK == eMarkType && refObj->HasDataLinks() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ ::so3::SvLinkSource* p = &refObj; diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx index 4aeaff5b5..9c03119b6 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_crsrsh.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -216,7 +216,7 @@ using namespace ::com::sun::star::util; /*N*/SwPaM * SwCrsrShell::CreateCrsr() /*N*/{ -DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 // Innerhalb der Tabellen-SSelection keinen neuen Crsr anlegen +DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 // Innerhalb der Tabellen-SSelection keinen neuen Crsr anlegen //STRIP001 ASSERT( !IsTableMode(), "in Tabellen SSelection" ); //STRIP001 //STRIP001 // neuen Cursor als Kopie vom akt. und in den Ring aufnehmen @@ -262,7 +262,7 @@ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 // Innerhalb der Tabellen-SS /*N*/ { /*N*/ if( pTblCrsr ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( bMakeTblCrsr && pTblCrsr->IsCrsrMovedUpdt() ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( bMakeTblCrsr && pTblCrsr->IsCrsrMovedUpdt() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ // geparkte Cursor werden nicht wieder erzeugt //STRIP001 /*?*/ const SwCntntNode* pCNd; @@ -369,7 +369,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( bMakeTblCrsr && pTblCrsr->Is /*?*/ // der Cursor geupdatet werden; um z.B. den /*?*/ // TabellenCursor zu erzeugen. Im UpdateCrsr wird /*?*/ // das jetzt beruecksichtigt! -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHKRANGE, bIdleEnd ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHKRANGE, bIdleEnd ); //STRIP001 /*?*/ //STRIP001 /*?*/ { //STRIP001 /*?*/ // Crsr-Moves ueberwachen, evt. Link callen @@ -495,7 +495,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHK /*N*/ FASTBOOL SwCrsrShell::SttEndDoc( BOOL bStt ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen //STRIP001 //STRIP001 FASTBOOL bRet = pCurCrsr->SttEndDoc( bStt ); //STRIP001 if( bRet ) @@ -586,7 +586,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ UpdateCrsr( SwCrsrShell::CHK /*N*/ int SwCrsrShell::SetCrsr( const Point &rLPt, BOOL bOnlyText ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 SET_CURR_SHELL( this ); +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 SET_CURR_SHELL( this ); //STRIP001 //STRIP001 SwNodes& rNds = GetDoc()->GetNodes(); //STRIP001 SwShellCrsr* pCrsr = IsTableMode() ? pTblCrsr : pCurCrsr; @@ -1162,7 +1162,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 SET_CURR_SHELL( this ); /*M*/ pTstCrsr->GetNode( TRUE )->FindStartNode() != /*M*/ pTstCrsr->GetNode( FALSE )->FindStartNode() )) /*M*/ /*|| ( !pTblCrsr && lcl_IsInValueBox( *pTstCrsr, *this ) )*/ ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwShellCrsr* pITmpCrsr = pTblCrsr ? pTblCrsr : pCurCrsr; //STRIP001 /*?*/ Point aTmpPt( pITmpCrsr->GetPtPos() ); //STRIP001 /*?*/ Point aTmpMk( pITmpCrsr->GetMkPos() ); @@ -1296,7 +1296,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 SET_CURR_SHELL( this ); /*M*/ pSectNd->GetSection().IsProtectFlag() && /*M*/ ( !pDoc->GetDocShell() || /*M*/ !pDoc->GetDocShell()->IsReadOnly() || bAllProtect )) ) ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( !FindValidCntntNode( !HasDrawView() || //STRIP001 /*?*/ 0 == Imp()->GetDrawView()->GetMarkList().GetMarkCount())) //STRIP001 /*?*/ { @@ -1323,7 +1323,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 SET_CURR_SHELL( this ); /*M*/ bAllProtect = FALSE; /*M*/ if( bWasAllProtect && GetDoc()->GetDocShell() && /*M*/ GetDoc()->GetDocShell()->IsReadOnlyUI() ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ GetDoc()->GetDocShell()->SetReadOnlyUI( FALSE ); //STRIP001 /*?*/ CallChgLnk(); // UI bescheid sagen! /*M*/ } @@ -1391,7 +1391,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 SET_CURR_SHELL( this ); /*M*/ } /*M*/ else if ( Imp()->IsIdleAction() ) /*M*/ //Wir stellen sicher, dass anstaendig Formatiert wurde #42224# -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pFrm->PrepareCrsr(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pFrm->PrepareCrsr(); /*M*/ /*M*/ // im geschuetzten Fly? aber bei Rahmenselektion ignorieren /*M*/ if( !IsReadOnlyAvailable() && pFrm->IsProtected() && @@ -1399,7 +1399,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 SET_CURR_SHELL( this ); /*M*/ !Imp()->GetDrawView()->GetMarkList().GetMarkCount() ) && /*M*/ (!pDoc->GetDocShell() || /*M*/ !pDoc->GetDocShell()->IsReadOnly() || bAllProtect ) ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // dann suche eine gueltige Position //STRIP001 /*?*/ BOOL bChgState = TRUE; //STRIP001 /*?*/ if( !FindValidCntntNode(!HasDrawView() || @@ -1523,7 +1523,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 SET_CURR_SHELL( this ); /*M*/ //Nur wenn gescrollt wurde, und wenn keine Selektion existiert. /*M*/ if( pFrm && Imp()->IsScrolled() && /*M*/ pCurCrsr->GetNext() == pCurCrsr && !pCurCrsr->HasMark() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 Imp()->RefreshScrolledArea( aCharRect ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 Imp()->RefreshScrolledArea( aCharRect ); /*M*/ /*M*/ /*M*/ eMvState = MV_NONE; // Status fuers Crsr-Travelling - GetCrsrOfst @@ -2741,7 +2741,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 SET_CURR_SHELL( this ); /*?*/ // wenn das Flag ausgeschaltet wird, dann muessen erstmal alle /*?*/ // Selektionen aufgehoben werden. Denn sonst wird sich darauf /*?*/ // verlassen, das nichts geschuetztes selektiert ist! -DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( !bFlag ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( !bFlag ) //STRIP001 /*?*/ { //STRIP001 /*?*/ ClearMark(); //STRIP001 /*?*/ } @@ -2756,7 +2756,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( !bFlag ) /*N*/ if( IsReadOnlyAvailable() ) /*N*/ { /*N*/ if( pTblCrsr ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 bRet = pTblCrsr->HasReadOnlyBoxSel() || +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 bRet = pTblCrsr->HasReadOnlyBoxSel() || //STRIP001 /*?*/ pTblCrsr->HasReadonlySel(); /*N*/ else /*N*/ { @@ -3005,7 +3005,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( !bFlag ) /*?*/ SwMoveFnCollection* SwCrsrShell::MakeFindRange( /*?*/ USHORT nStt, USHORT nEnd, SwPaM* pPam ) const /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 return pCurCrsr->MakeFindRange( (SwDocPositions)nStt, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return pCurCrsr->MakeFindRange( (SwDocPositions)nStt, //STRIP001 /*?*/ (SwDocPositions)nEnd, pPam ); /*?*/ } #endif @@ -3097,7 +3097,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( !bFlag ) replaced, remove the table cursor. */ /*N*/ if (pTblCrsr != NULL && bChanged) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 TblCrsrToCursor(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 TblCrsrToCursor(); /*N*/ } } diff --git a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx index e19c0a280..5274bf9ba 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_findattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_findattr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:24 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,7 +168,7 @@ using namespace ::com::sun::star::util; /*N*/ const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& rHtsArr, USHORT& rPos, /*N*/ xub_StrLen nCntntPos ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 while( rPos < rHtsArr.Count() ) //STRIP001 { //STRIP001 const SwTxtAttr *pTxtHt = rHtsArr.GetStart( rPos++ ); @@ -182,7 +182,7 @@ using namespace ::com::sun::star::util; /*N*/ const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, USHORT& rPos, /*N*/ xub_StrLen nCntntPos ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 while( rPos > 0 ) //STRIP001 { //STRIP001 //Hack mit cast fuer das Update @@ -1292,7 +1292,7 @@ struct SwFindParaAttr : public SwFindParas /*N*/int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, /*N*/ FASTBOOL bInReadOnly ) /*N*/{ -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 // String ersetzen ?? (nur wenn Text angegeben oder nicht attributiert +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 // String ersetzen ?? (nur wenn Text angegeben oder nicht attributiert //STRIP001 // gesucht wird) //STRIP001 BOOL bReplaceTxt = pSearchOpt && ( pSearchOpt->replaceString.getLength() || //STRIP001 !pSet->Count() ); @@ -1455,7 +1455,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 // String ersetzen ?? (nur wenn /*N*/int SwFindParaAttr::IsReplaceMode() const /*N*/{ -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return ( pSearchOpt && pSearchOpt->replaceString.getLength() ) || +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return ( pSearchOpt && pSearchOpt->replaceString.getLength() ) || //STRIP001 ( pReplSet && pReplSet->Count() ); /*N*/ } diff --git a/binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx b/binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx index 3357b6573..7871974b8 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_findcoll.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:27 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,7 +126,7 @@ namespace binfilter { /*M*/ ULONG SwCursor::Find( const SwTxtFmtColl& rFmtColl, /*M*/ SwDocPositions nStart, SwDocPositions nEnde, BOOL& bCancel, /*M*/ FindRanges eFndRngs, const SwTxtFmtColl* pReplFmtColl ) -/*M*/ {DBG_ASSERT(0, "STRIP");return 0;//STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP");return 0;//STRIP001 /*M*/ // OLE-Benachrichtigung abschalten !! //STRIP001 /*?*/ SwDoc* pDoc = GetDoc(); //STRIP001 /*?*/ Link aLnk( pDoc->GetOle2Link() ); diff --git a/binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx b/binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx index ac4756b31..a195550dd 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_findtxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_findtxt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:30 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -459,7 +459,7 @@ using namespace ::com::sun::star::util; /*M*/ SwDocPositions nStart, SwDocPositions nEnde, /*M*/ BOOL& bCancel, /*M*/ FindRanges eFndRngs, int bReplace ) -/*M*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 /*?*/ // OLE-Benachrichtigung abschalten !! //STRIP001 /*?*/ SwDoc* pDoc = GetDoc(); //STRIP001 /*?*/ Link aLnk( pDoc->GetOle2Link() ); diff --git a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx index e96459ed0..91396a49d 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_pam.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_pam.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_pam.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:13 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -864,7 +864,7 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None }; /*N*/ void GoStartSection( SwPosition * pPos ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // springe zum Anfang der Section //STRIP001 SwNodes& rNodes = pPos->nNode.GetNodes(); //STRIP001 USHORT nLevel = rNodes.GetSectionLevel( pPos->nNode ); @@ -880,7 +880,7 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None }; /*N*/ void GoEndSection( SwPosition * pPos ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // springe zum Anfang/Ende der Section //STRIP001 SwNodes& rNodes = pPos->nNode.GetNodes(); //STRIP001 USHORT nLevel = rNodes.GetSectionLevel( pPos->nNode ); @@ -903,7 +903,7 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None }; /*N*/ FASTBOOL GoInSection( SwPaM & rPam, SwMoveFn fnMove ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 (*fnMove->fnSections)( (SwPosition*)rPam.GetPoint() ); /*N*/ return TRUE; /*N*/ } @@ -928,7 +928,7 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None }; /*N*/ } /*N*/ FASTBOOL GoInCntntCells( SwPaM & rPam, SwMoveFn fnMove ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(), //STRIP001 &rPam.GetPoint()->nContent, CRSR_SKIP_CELLS )) //STRIP001 return TRUE; @@ -939,7 +939,7 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None }; /*N*/ FASTBOOL GoPrevPara( SwPaM & rPam, SwPosPara aPosPara ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( rPam.Move( fnMoveBackward, fnGoNode ) ) //STRIP001 { //STRIP001 // steht immer auf einem ContentNode ! @@ -1019,7 +1019,7 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None }; /*N*/ FASTBOOL GoNextSection( SwPaM & rPam, SwMoveFn fnMove ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwPosition& rPos = *rPam.GetPoint(); //STRIP001 SwPosition aSavePos( rPos ); // eine Vergleichsposition //STRIP001 SwNodes& rNds = aSavePos.nNode.GetNodes(); @@ -1040,7 +1040,7 @@ enum CHKSECTION { Chk_Both, Chk_One, Chk_None }; /*N*/ FASTBOOL GoPrevSection( SwPaM & rPam, SwMoveFn fnMove ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwPosition& rPos = *rPam.GetPoint(); //STRIP001 SwPosition aSavePos( rPos ); // eine Vergleichsposition //STRIP001 SwNodes& rNds = aSavePos.nNode.GetNodes(); diff --git a/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx b/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx index 048e96a39..57b7b6e7f 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swcrsr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:35 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -326,7 +326,7 @@ struct _PercentHdl /*N*/ ((bSkipOverHiddenSections && pSectNd->GetSection().IsHiddenFlag() ) || /*N*/ (bSkipOverProtectSections && pSectNd->GetSection().IsProtectFlag() ))) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( 0 == ( SELOVER_CHANGEPOS & eFlags ) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( 0 == ( SELOVER_CHANGEPOS & eFlags ) ) //STRIP001 /*?*/ { //STRIP001 /*?*/ // dann wars das schon //STRIP001 /*?*/ RestoreSavePos(); @@ -379,7 +379,7 @@ struct _PercentHdl // oder sollte eine geschuetzte Section innerhalb der Selektion liegen? /*N*/ if( HasMark() && bSkipOverProtectSections) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ULONG nSttIdx = GetMark()->nNode.GetIndex(), +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ULONG nSttIdx = GetMark()->nNode.GetIndex(), //STRIP001 /*?*/ nEndIdx = GetPoint()->nNode.GetIndex(); //STRIP001 /*?*/ if( nEndIdx <= nSttIdx ) //STRIP001 /*?*/ { @@ -420,7 +420,7 @@ struct _PercentHdl /*N*/ const SwNode* pNd = &GetPoint()->nNode.GetNode(); /*N*/ if( pNd->IsCntntNode() && 0 == (SwUnoCrsr*)*this ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwCntntFrm* pFrm = ((SwCntntNode*)pNd)->GetFrm(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwCntntFrm* pFrm = ((SwCntntNode*)pNd)->GetFrm(); //STRIP001 /*?*/ if( pFrm && pFrm->IsValid() && 0 == pFrm->Frm().Height() && //STRIP001 /*?*/ 0 != ( SELOVER_CHANGEPOS & eFlags ) ) //STRIP001 /*?*/ { @@ -460,7 +460,7 @@ struct _PercentHdl // darf der Cursor in geschuetzen "Nodes" stehen? /*N*/ if( 0 == ( SELOVER_CHANGEPOS & eFlags ) && !IsAtValidPos() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DeleteMark(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DeleteMark(); //STRIP001 /*?*/ RestoreSavePos(); //STRIP001 /*?*/ return TRUE; /*N*/ } @@ -472,7 +472,7 @@ struct _PercentHdl /*N*/ // GrundSections: /*N*/ if( !::binfilter::CheckNodesRange( GetMark()->nNode, GetPoint()->nNode, TRUE )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DeleteMark(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DeleteMark(); //STRIP001 /*?*/ RestoreSavePos(); //STRIP001 /*?*/ return TRUE; // ohne Frames geht gar nichts! /*N*/ } @@ -482,7 +482,7 @@ struct _PercentHdl /*N*/ if( (pNd = &GetMark()->nNode.GetNode())->IsCntntNode() && /*N*/ !((SwCntntNode*)pNd)->GetFrm() && 0 == (SwUnoCrsr*)*this ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 DeleteMark(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 DeleteMark(); //STRIP001 /*?*/ RestoreSavePos(); //STRIP001 /*?*/ return TRUE; // ohne Frames geht gar nichts! /*N*/ } @@ -496,7 +496,7 @@ struct _PercentHdl // in unterschiedlichen Tabellen oder nur Mark in der Tabelle /*?*/ if( ( pPtNd && pMrkNd ) || pMrkNd ) /*?*/ { // dann lasse das nicht zu, alte Pos zurueck -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 RestoreSavePos(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 RestoreSavePos(); //STRIP001 /*?*/ // Crsr bleibt an der alten Position //STRIP001 /*?*/ return TRUE; /*?*/ } @@ -504,7 +504,7 @@ struct _PercentHdl // ACHTUNG: dieses kann nicht im TableMode geschehen !! /*?*/ if( pPtNd ) // nur Point in Tabelle, dann gehe hinter/vor diese /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( SELOVER_CHANGEPOS & eFlags ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( SELOVER_CHANGEPOS & eFlags ) //STRIP001 /*?*/ { //STRIP001 /*?*/ FASTBOOL bSelTop = GetPoint()->nNode.GetIndex() < //STRIP001 /*?*/ (( SELOVER_TOGGLE & eFlags ) ? pSavePos->nNode @@ -580,7 +580,7 @@ struct _PercentHdl /*?*/ if( !bMove ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( bChgCrsr ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( bChgCrsr ) //STRIP001 /*?*/ // dann verbleibe auf der alten Position //STRIP001 /*?*/ RestoreSavePos(); //STRIP001 /*?*/ return TRUE; // Crsr bleibt an der alten Position @@ -590,7 +590,7 @@ struct _PercentHdl /*?*/ // von Oben nach Unten Traveln ? /*?*/ if( pSavePos->nNode < GetPoint()->nNode.GetIndex() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // suche die naechste "gueltige" Box +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // suche die naechste "gueltige" Box /*?*/ //STRIP001 /*?*/ // folgt nach dem EndNode der Zelle ein weiterer StartNode, dann //STRIP001 /*?*/ // gibt es auch eine naechste Zelle @@ -651,7 +651,7 @@ struct _PercentHdl /*?*/ /*?*/ // suche die vorherige "gueltige" Box /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // liegt vor dem StartNode der Zelle ein weiterer EndNode, dann +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // liegt vor dem StartNode der Zelle ein weiterer EndNode, dann /*?*/ // gibt es auch eine vorherige Zelle //STRIP001 /*?*/ #if defined( UNX ) || defined( MAC ) //STRIP001 /*?*/ SwNodeIndex* pCellStt = new SwNodeIndex( @@ -715,7 +715,7 @@ struct _PercentHdl // TRUE: an die Position kann der Cursor gesetzt werden /*N*/ FASTBOOL SwCursor::IsAtValidPos( BOOL bPoint ) const /*N*/ { -DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc(); +DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc(); //STRIP001 const SwPosition* pPos = bPoint ? GetPoint() : GetMark(); //STRIP001 const SwNode* pNd = &pPos->nNode.GetNode(); //STRIP001 @@ -948,7 +948,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*M*/ ULONG SwCursor::FindAll( SwFindParas& rParas, /*M*/ SwDocPositions nStart, SwDocPositions nEnde, /*M*/ FindRanges eFndRngs, BOOL& bCancel ) -/*M*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 /*?*/ bCancel = FALSE; //STRIP001 /*?*/ SwCrsrSaveState aSaveState( *this ); //STRIP001 /*?*/ @@ -1157,7 +1157,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*N*/ FASTBOOL SwCursor::IsStartWord() const /*N*/ { -/*N*/ FASTBOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ FASTBOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwTxtNode* pTxtNd = GetNode()->GetTxtNode(); //STRIP001 if( pTxtNd && pBreakIt->xBreak.is() ) //STRIP001 { @@ -1172,7 +1172,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*N*/ FASTBOOL SwCursor::IsEndWord() const /*N*/ { - FASTBOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); //STRIP001 + FASTBOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwTxtNode* pTxtNd = GetNode()->GetTxtNode(); //STRIP001 if( pTxtNd && pBreakIt->xBreak.is() ) //STRIP001 { @@ -1213,7 +1213,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*N*/ FASTBOOL SwCursor::GoStartWord() /*N*/ { -/*N*/ FASTBOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ FASTBOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwTxtNode* pTxtNd = GetNode()->GetTxtNode(); //STRIP001 if( pTxtNd && pBreakIt->xBreak.is() ) //STRIP001 { @@ -1237,7 +1237,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*N*/ FASTBOOL SwCursor::GoEndWord() /*N*/ { -/*N*/ FASTBOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ FASTBOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwTxtNode* pTxtNd = GetNode()->GetTxtNode(); //STRIP001 if( pTxtNd && pBreakIt->xBreak.is() ) //STRIP001 { @@ -1262,7 +1262,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*N*/ FASTBOOL SwCursor::GoNextWord() /*N*/ { -/*?*/ FASTBOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ FASTBOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwTxtNode* pTxtNd = GetNode()->GetTxtNode(); //STRIP001 if( pTxtNd && pBreakIt->xBreak.is() ) //STRIP001 { @@ -1286,7 +1286,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*N*/ FASTBOOL SwCursor::GoPrevWord() /*N*/ { -/*?*/ FASTBOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ FASTBOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwTxtNode* pTxtNd = GetNode()->GetTxtNode(); //STRIP001 if( pTxtNd && pBreakIt->xBreak.is() ) //STRIP001 { @@ -1360,7 +1360,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() //----------------------------------------------------------------------------- /*N*/ FASTBOOL SwCursor::GoSentence( SentenceMoveType eMoveType ) /*N*/ { -/*?*/ FASTBOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*?*/ FASTBOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 const SwTxtNode* pTxtNd = GetNode()->GetTxtNode(); //STRIP001 if( pTxtNd && pBreakIt->xBreak.is() ) //STRIP001 { @@ -1409,7 +1409,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*N*/ const BOOL bDoNotSetBidiLevel = 0 != (SwUnoCrsr*)*this; /*N*/ /*N*/ if ( ! bDoNotSetBidiLevel ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( rNode.IsTxtNode() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ const SwTxtNode& rTNd = *rNode.GetTxtNode(); @@ -1459,7 +1459,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*N*/ /*N*/ // here come some special rules for visual cursor travelling /*N*/ if ( pSttFrm ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwNode& rTmpNode = GetPoint()->nNode.GetNode(); //STRIP001 /*?*/ if ( &rTmpNode != &rNode && rTmpNode.IsTxtNode() ) //STRIP001 /*?*/ { @@ -1485,7 +1485,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 const SwDoc* pDoc = GetDoc() /*N*/ FASTBOOL SwCursor::UpDown( BOOL bUp, USHORT nCnt, /*N*/ Point* pPt, long nUpDownX ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SwTableCursor* pTblCrsr = (SwTableCursor*)*this; +DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SwTableCursor* pTblCrsr = (SwTableCursor*)*this; //STRIP001 sal_Bool bAdjustTableCrsr = sal_False; //STRIP001 //STRIP001 // vom Tabellen Crsr Point/Mark in der gleichen Box ?? @@ -1637,7 +1637,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SwTableCursor* pTblCrsr = (SwTab /*N*/ FASTBOOL SwCursor::IsAtLeftRightMargin( BOOL bLeft, BOOL bAPI ) const /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 FASTBOOL bRet = FALSE; +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 FASTBOOL bRet = FALSE; //STRIP001 Point aPt; //STRIP001 SwCntntFrm * pFrm = GetCntntNode()->GetFrm( &aPt, GetPoint() ); //STRIP001 if( pFrm ) @@ -1732,7 +1732,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SwTableCursor* pTblCrsr = (SwTab /*N*/ FASTBOOL SwCursor::GotoTblBox( const String& rName ) /*N*/ { -/*N*/ FASTBOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ FASTBOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 const SwTableNode* pTblNd = GetPoint()->nNode.GetNode().FindTableNode(); //STRIP001 if( pTblNd ) //STRIP001 { @@ -1841,7 +1841,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SwTableCursor* pTblCrsr = (SwTab /*N*/ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 if( bChg ) // ??? +DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 if( bChg ) // ??? //STRIP001 { //STRIP001 if( bParked ) //STRIP001 { @@ -1961,7 +1961,7 @@ DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 if( bChg ) // ??? /*N*/ void SwTableCursor::InsertBox( const SwTableBox& rTblBox ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwTableBox* pBox = (SwTableBox*)&rTblBox; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTableBox* pBox = (SwTableBox*)&rTblBox; //STRIP001 aSelBoxes.Insert( pBox ); //STRIP001 bChg = TRUE; /*N*/ } diff --git a/binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx b/binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx index 7f4e05455..3b5aab4b7 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_trvlreg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:38 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,7 @@ namespace binfilter { /*N*/ FASTBOOL GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, /*N*/ FASTBOOL bInReadOnly ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode ); //STRIP001 SwSectionNode* pNd = aIdx.GetNode().FindSectionNode(); //STRIP001 if( pNd ) @@ -150,7 +150,7 @@ namespace binfilter { /*N*/ FASTBOOL GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, /*N*/ FASTBOOL bInReadOnly ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode ); //STRIP001 SwSectionNode* pNd = aIdx.GetNode().FindSectionNode(); //STRIP001 if( pNd ) @@ -206,7 +206,7 @@ namespace binfilter { /*N*/ FASTBOOL GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, /*N*/ FASTBOOL bInReadOnly ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 //STRIP001 SwSectionNode* pNd = rCurCrsr.GetNode()->FindSectionNode(); //STRIP001 if( !pNd ) //STRIP001 return FALSE; @@ -238,7 +238,7 @@ namespace binfilter { /*N*/ FASTBOOL GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, /*N*/ FASTBOOL bInReadOnly ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwNode* pCurrNd = rCurCrsr.GetNode(); //STRIP001 SwSectionNode* pNd = pCurrNd->FindSectionNode(); //STRIP001 if( !pNd ) @@ -286,7 +286,7 @@ namespace binfilter { /*N*/ FASTBOOL SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SwCrsrSaveState aSaveState( *this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SwCrsrSaveState aSaveState( *this ); //STRIP001 return !(SwTableCursor*)*this && //STRIP001 (*fnWhichRegion)( *this, fnPosRegion, IsReadOnlyAvailable() ) && //STRIP001 !IsSelOvr() && diff --git a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx index 08ebc7bcf..86f3402d3 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_trvltbl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:38 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -436,7 +436,7 @@ namespace binfilter { /*N*/ FASTBOOL GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl, /*N*/ FASTBOOL bInReadOnly ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode ); //STRIP001 SwTableNode* pTblNd = aIdx.GetNode().FindTableNode(); //STRIP001 if( pTblNd ) @@ -481,7 +481,7 @@ namespace binfilter { /*N*/ FASTBOOL GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl, /*N*/ FASTBOOL bInReadOnly ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode ); //STRIP001 SwTableNode* pTblNd = aIdx.GetNode().FindTableNode(); //STRIP001 if( pTblNd ) @@ -526,7 +526,7 @@ namespace binfilter { /*N*/ FASTBOOL GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl, /*N*/ FASTBOOL bInReadOnly ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwTableNode* pTblNd = rCurCrsr.GetPoint()->nNode.GetNode().FindTableNode(); //STRIP001 if( !pTblNd ) //STRIP001 return FALSE; @@ -552,7 +552,7 @@ namespace binfilter { /*N*/ FASTBOOL SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl ) /*N*/ { -/*N*/ FASTBOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ FASTBOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwTableCursor* pTblCrsr = (SwTableCursor*)*this; //STRIP001 //STRIP001 if( pTblCrsr || !HasMark() ) // nur wenn kein Mark oder ein TblCrsr @@ -683,7 +683,7 @@ namespace binfilter { /*N*/ FASTBOOL SwCrsrShell::GotoTable( const String& rName ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, //STRIP001 /*?*/ FASTBOOL bRet = !pTblCrsr && pCurCrsr->GotoTable( rName ); //STRIP001 /*?*/ if( bRet ) //STRIP001 /*?*/ { @@ -754,7 +754,7 @@ namespace binfilter { /*?*/ { /*?*/ // jetzt sollten wir mal die Pointer zerstoeren, bevor ein weiterer /*?*/ // aufruf kommt. -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ClearTblBoxCntnt(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearTblBoxCntnt(); //STRIP001 /*?*/ StartAction(); //STRIP001 /*?*/ GetDoc()->ChkBoxNumFmt( *pChkBox, TRUE ); //STRIP001 /*?*/ EndAction(); @@ -766,7 +766,7 @@ namespace binfilter { /*N*/ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if( IsSelTblCells() || !IsAutoUpdateCells() ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( IsSelTblCells() || !IsAutoUpdateCells() ) //STRIP001 return ; //STRIP001 //STRIP001 if( !pPos ) diff --git a/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx b/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx index 4da9d0132..eb9545ebc 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_unocrsr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -230,12 +230,12 @@ SwCursor* SwUnoCrsr::Create( SwPaM* pRing ) const /*N*/ : SwTableCursor( rPos ), SwUnoCrsr( rPos ), SwCursor( rPos ), /*N*/ aTblSel( rPos ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SetRemainInSection( FALSE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SetRemainInSection( FALSE ); /*N*/ } /*N*/ SwUnoTableCrsr::~SwUnoTableCrsr() /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 while( aTblSel.GetNext() != &aTblSel ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 while( aTblSel.GetNext() != &aTblSel ) //STRIP001 /*?*/ delete aTblSel.GetNext(); // und loeschen /*N*/ } @@ -252,7 +252,7 @@ SwCursor* SwUnoTableCrsr::Create( SwPaM* pRing ) const /*N*/ FASTBOOL SwUnoTableCrsr::IsSelOvr( int eFlags ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 FASTBOOL bRet = SwUnoCrsr::IsSelOvr( eFlags ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 FASTBOOL bRet = SwUnoCrsr::IsSelOvr( eFlags ); //STRIP001 /*?*/ if( !bRet ) //STRIP001 /*?*/ { //STRIP001 /*?*/ const SwTableNode* pTNd = GetPoint()->nNode.GetNode().FindTableNode(); @@ -264,7 +264,7 @@ SwCursor* SwUnoTableCrsr::Create( SwPaM* pRing ) const /*N*/ } /*N*/ void SwUnoTableCrsr::MakeBoxSels() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwCntntNode* pCNd; //STRIP001 bool bMakeTblCrsrs = true; //STRIP001 if( GetPoint()->nNode.GetIndex() && GetMark()->nNode.GetIndex() && @@ -300,7 +300,7 @@ SwCursor* SwUnoTableCrsr::Create( SwPaM* pRing ) const /*N*/ { /*N*/ SwUnoCrsr* pNew; /*N*/ if( bTblCrsr ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pNew = new SwUnoTableCrsr( rPos ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pNew = new SwUnoTableCrsr( rPos ); /*N*/ else /*N*/ pNew = new SwUnoCrsr( rPos ); /*N*/ diff --git a/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx b/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx index a3d20623c..193e058e0 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_viscrs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_viscrs.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -574,7 +574,7 @@ MapMode* SwSelPaintRects::pMapMode = 0; /*N*/ } /*N*/ /*N*/ if( aRect.Height() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ::SwCalcPixStatics( pCrsrShell->GetOut() ); //STRIP001 /*?*/ ::SwAlignRect( aRect, (ViewShell*)pCrsrShell ); /*N*/ } @@ -619,7 +619,7 @@ MapMode* SwSelPaintRects::pMapMode = 0; /*N*/ void SwSelPaintRects::Hide() /*N*/ { /*N*/ for( USHORT n = 0; n < Count(); ++n ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 Paint( (*this)[n] ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 Paint( (*this)[n] ); /*N*/ SwRects::Remove( 0, Count() ); /*N*/ } @@ -639,7 +639,7 @@ MapMode* SwSelPaintRects::pMapMode = 0; /*N*/ /*N*/ if( Count() || aTmp.Count() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwRegionRects aReg( pCShell->VisArea() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwRegionRects aReg( pCShell->VisArea() ); //STRIP001 /*?*/ //STRIP001 /*?*/ // suche die neu selektierten Rechtecke heraus //STRIP001 /*?*/ aReg.Remove( 0, aReg.Count() ); @@ -836,7 +836,7 @@ MapMode* SwSelPaintRects::pMapMode = 0; /*N*/ (GetMark()->nNode == GetPoint()->nNode || /*N*/ (GetMark()->nNode.GetNode().IsCntntNode() && /*N*/ GetMark()->nNode.GetNode().GetCntntNode()->GetFrm() ) )) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 GetDoc()->GetRootFrm()->CalcFrmRects( *this, GetShell()->IsTableMode() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 GetDoc()->GetRootFrm()->CalcFrmRects( *this, GetShell()->IsTableMode() ); /*N*/ } diff --git a/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx b/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx index f65cbb768..3b6ad908c 100644 --- a/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_SwStyleNameMapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_SwStyleNameMapper.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -900,7 +900,7 @@ const struct SwTableEntry NumRuleProgNameTable [] = // Get the programmatic Name from the pool ID /*N*/ void SwStyleNameMapper::FillProgName ( sal_uInt16 nId, String& rFillName ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 fillNameFromId ( nId, rFillName, sal_True ); /*N*/ } // Get the programmatic Name from the pool ID diff --git a/binfilter/bf_sw/source/core/doc/sw_doc.cxx b/binfilter/bf_sw/source/core/doc/sw_doc.cxx index ee4806920..420253b9d 100644 --- a/binfilter/bf_sw/source/core/doc/sw_doc.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_doc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_doc.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:14 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -358,11 +358,11 @@ namespace binfilter { /*N*/ { /*N*/ // verschiebe noch alle Bookmarks/TOXMarks/FlyAtCnt /*N*/ if( aBkmkArr.Count() ) -/*?*/ { DBG_ASSERT(0, "STRIP"); }//STRIP001 _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, TRUE ); +/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, TRUE ); /*N*/ /*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( rPos ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( rPos ); //STRIP001 /*?*/ aPam.SetMark(); //STRIP001 /*?*/ aPam.Move( fnMoveBackward ); //STRIP001 /*?*/ if( IsRedlineOn() ) @@ -403,7 +403,7 @@ namespace binfilter { /*N*/ /*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( rPos ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( rPos ); //STRIP001 /*?*/ aPam.SetMark(); //STRIP001 /*?*/ aPam.Move( fnMoveBackward ); //STRIP001 /*?*/ if( IsRedlineOn() ) @@ -426,7 +426,7 @@ namespace binfilter { /*N*/ if( pACEWord ) // Aufnahme in die Autokorrektur /*N*/ { /*?*/ if( 1 == rStr.Len() && pACEWord->IsDeleted() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pACEWord->CheckChar( *pPos, rStr.GetChar( 0 ) ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pACEWord->CheckChar( *pPos, rStr.GetChar( 0 ) ); /*?*/ delete pACEWord, pACEWord = 0; /*N*/ } /*N*/ @@ -478,7 +478,7 @@ namespace binfilter { /*N*/ /*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( pPos->nNode, aTmp.GetCntnt(), +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( pPos->nNode, aTmp.GetCntnt(), //STRIP001 /*?*/ pPos->nNode, pPos->nContent.GetIndex()); //STRIP001 /*?*/ if( IsRedlineOn() ) //STRIP001 /*?*/ AppendRedline( new SwRedline( REDLINE_INSERT, aPam )); @@ -776,7 +776,7 @@ void SwDoc::SetGlobalMacro( USHORT nEvent, const SvxMacro& rMacro ) // OS 25.06.96: ab jetzt wird immer die Anzahl der Referenzen returnt /*N*/ USHORT SwDoc::GetRefMarks( SvStringsDtor* pNames ) const /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 const SfxPoolItem* pItem; +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 const SfxPoolItem* pItem; //STRIP001 const SwTxtRefMark* pTxtRef; //STRIP001 //STRIP001 USHORT nMaxItems = GetAttrPool().GetItemCount( RES_TXTATR_REFMARK ); @@ -837,7 +837,7 @@ void SwDoc::SetGlobalMacro( USHORT nEvent, const SvxMacro& rMacro ) /*N*/ const String& rFltName, const Graphic* pGraphic, /*N*/ const GraphicObject* pGrafObj ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 SwGrfNode *pGrfNd; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwGrfNode *pGrfNd; //STRIP001 if( ( !rPam.HasMark() //STRIP001 || rPam.GetPoint()->nNode.GetIndex() == rPam.GetMark()->nNode.GetIndex() ) //STRIP001 && 0 != ( pGrfNd = rPam.GetPoint()->nNode.GetNode().GetGrfNode() ) ) diff --git a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx index 65c440daf..dee492ab3 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docbm.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,7 +152,7 @@ namespace binfilter { /*N*/ { /*N*/ SwBookmark *pBM; /*N*/ if( MARK == eMark ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pBM = new SwMark( *rPaM.GetPoint(), rCode, rName, rShortName ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pBM = new SwMark( *rPaM.GetPoint(), rCode, rName, rShortName ); /*N*/ else if( BOOKMARK == eMark ) /*N*/ { /*N*/ pBM = new SwBookmark(*rPaM.GetPoint(), rCode, rName, rShortName); @@ -186,7 +186,7 @@ namespace binfilter { /*N*/ SwBookmark *pBM = (*pBookmarkTbl)[nPos]; /*N*/ if( DoesUndo() && !pBM->IsUNOMark()) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); //STRIP001 /*?*/ AppendUndo( new SwUndoDelBookmark( *pBM )); /*N*/ } /*N*/ @@ -199,7 +199,7 @@ namespace binfilter { /*N*/ /*N*/ SwServerObject* pServObj = pBM->GetObject(); /*N*/ if( pServObj ) // dann aus der Liste entfernen -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 GetLinkManager().RemoveServer( pServObj ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 GetLinkManager().RemoveServer( pServObj ); /*N*/ /*N*/ delete pBM; /*N*/ } @@ -260,7 +260,7 @@ namespace binfilter { // werden, es wird dann bei gleichen Namen nur durchnumeriert. /*N*/ void SwDoc::MakeUniqueBookmarkName( String& rNm ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ASSERT( rNm.Len(), "es sollte ein Name vorgegeben werden!" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ASSERT( rNm.Len(), "es sollte ein Name vorgegeben werden!" ); //STRIP001 //STRIP001 // wir erzeugen uns eine temp. Bookmark //STRIP001 String sTmp; @@ -285,7 +285,7 @@ namespace binfilter { /*N*/ aCode( rBkmk.GetKeyCode() ), eBkmkType( (SaveBookmarkType)eType ), /*N*/ eOrigBkmType(rBkmk.GetType()) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 nNode1 = rBkmk.GetPos().nNode.GetIndex(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 nNode1 = rBkmk.GetPos().nNode.GetIndex(); //STRIP001 nCntnt1 = rBkmk.GetPos().nContent.GetIndex(); //STRIP001 //STRIP001 if( BKMK_POS & eBkmkType ) @@ -976,7 +976,7 @@ namespace binfilter { /*N*/ void _RestoreCntntIdx( SvULongs& rSaveArr, const SwNode& rNd, /*N*/ xub_StrLen nLen, xub_StrLen nChkLen ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwDoc* pDoc = rNd.GetDoc(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwDoc* pDoc = rNd.GetDoc(); //STRIP001 const SwBookmarks& rBkmks = pDoc->GetBookmarks(); //STRIP001 const SwRedlineTbl& rRedlTbl = pDoc->GetRedlineTbl(); //STRIP001 const SwSpzFrmFmts* pSpz = pDoc->GetSpzFrmFmts(); diff --git a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx index ee8c6d8a5..f2c7a20e9 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docchart.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:53 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -430,7 +430,7 @@ namespace binfilter { /*N*/ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const String &rNewName ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 const String aOldName( rTblFmt.GetName() ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const String aOldName( rTblFmt.GetName() ); //STRIP001 //STRIP001 BOOL bNameFound = 0 == rNewName.Len(); //STRIP001 if( !bNameFound ) diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx index 1dd9d525a..ae6c9870c 100644 --- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_doccorr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:54 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -226,7 +226,7 @@ namespace binfilter { /*N*/ register SwBookmark* pBkmk; /*N*/ for( USHORT n = 0; n < rBkmks.Count(); ++n ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // liegt auf der Position ?? +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // liegt auf der Position ?? //STRIP001 /*?*/ int bChgd = 0; //STRIP001 /*?*/ if( &( pBkmk = (SwBookmark*)rBkmks[ n ])->pPos1->nNode.GetNode() == pOldNode ) //STRIP001 /*?*/ { @@ -261,7 +261,7 @@ namespace binfilter { /*N*/ for( USHORT n = 0; n < rTbl.Count(); ++n ) /*N*/ { /*?*/ // liegt auf der Position ?? -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 _PaMCorrAbs1( rTbl[ n ] ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 _PaMCorrAbs1( rTbl[ n ] ) /*N*/ } /*N*/ } /*N*/ @@ -451,7 +451,7 @@ namespace binfilter { /*N*/ SwUnoTableCrsr* pUnoTblCrsr = (SwUnoTableCrsr*)*rTbl[ n ]; /*N*/ if( pUnoTblCrsr ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 FOREACHPAM_START( &pUnoTblCrsr->GetSelRing() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 FOREACHPAM_START( &pUnoTblCrsr->GetSelRing() ) //STRIP001 /*?*/ _PaMCorrAbs3( PCURCRSR ) //STRIP001 /*?*/ FOREACHPAM_END() /*N*/ } @@ -535,7 +535,7 @@ namespace binfilter { /*N*/ SwUnoTableCrsr* pUnoTblCrsr = (SwUnoTableCrsr*)*rTbl[ n ]; /*N*/ if( pUnoTblCrsr ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 FOREACHPAM_START( &pUnoTblCrsr->GetSelRing() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 FOREACHPAM_START( &pUnoTblCrsr->GetSelRing() ) //STRIP001 /*?*/ _PaMCorrRel1( PCURCRSR ) //STRIP001 /*?*/ FOREACHPAM_END() /*N*/ } @@ -581,7 +581,7 @@ namespace binfilter { /*N*/ pBkmk->pPos2->nNode.GetNode().FindTableBoxStartNode() != /*N*/ pBkmk->pPos1->nNode.GetNode().FindTableBoxStartNode() ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( 1 == bChgd ) +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( 1 == bChgd ) //STRIP001 /*?*/ *pBkmk->pPos1 = *pBkmk->pPos2; //STRIP001 /*?*/ delete pBkmk->pPos2, pBkmk->pPos2 = 0; //STRIP001 /*?*/ if( pBkmk->IsServer() ) @@ -598,7 +598,7 @@ namespace binfilter { /*N*/ for( USHORT n = 0; n < rTbl.Count(); ++n ) /*N*/ { /*N*/ // liegt auf der Position ?? -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 _PaMCorrRel1( rTbl[ n ] ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 _PaMCorrRel1( rTbl[ n ] ) /*N*/ } /*N*/ } /*N*/ diff --git a/binfilter/bf_sw/source/core/doc/sw_docdde.cxx b/binfilter/bf_sw/source/core/doc/sw_docdde.cxx index 0e1fe85c6..68f2a29c6 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docdde.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docdde.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docdde.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:55 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -142,7 +142,7 @@ struct _FindItem /*N*/ BOOL lcl_FindBookmark( const SwBookmarkPtr& rpBkmk, void* pArgs ) /*N*/ { -/*N*/ BOOL bRet = TRUE; DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ BOOL bRet = TRUE; DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 String sNm( GetAppCharClass().lower( rpBkmk->GetName() )); //STRIP001 if( sNm.Equals( ((_FindItem*)pArgs)->rItem ) ) //STRIP001 { @@ -284,7 +284,7 @@ struct _FindItem /*N*/ lcl_FindBookmark, &aPara ); /*N*/ if( aPara.pBkmk && aPara.pBkmk->GetOtherPos() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // gefunden, also Hotlink einrichten +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // gefunden, also Hotlink einrichten /*?*/ // sollten wir schon einer sein? //STRIP001 /*?*/ if( 0 == (pObj = aPara.pBkmk->GetObject()) ) //STRIP001 /*?*/ { @@ -316,7 +316,7 @@ struct _FindItem /*N*/ lcl_FindTable, &aPara ); /*N*/ if( aPara.pTblNd ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // gefunden, also Hotlink einrichten +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // gefunden, also Hotlink einrichten /*?*/ // sollten wir schon einer sein? //STRIP001 /*?*/ if( 0 == (pObj = aPara.pTblNd->GetTable().GetObject()) ) //STRIP001 /*?*/ { @@ -357,7 +357,7 @@ struct _FindItem /*N*/ // sondern auch Rahmen(Text!), Tabellen, Gliederungen: /*N*/ if( STRING_NOTFOUND != nPos ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bWeiter = FALSE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bWeiter = FALSE; //STRIP001 /*?*/ String sName( sItem.Copy( 0, nPos ) ); //STRIP001 /*?*/ String sCmp( sItem.Copy( nPos + 1 )); //STRIP001 /*?*/ rCC.toLower( sItem ); diff --git a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx index 7f6978698..fcfa377dd 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docdraw.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -208,7 +208,7 @@ using namespace ::com::sun::star::linguistic2; /*N*/ { // OD 30.06.2003 #108784# - replace marked 'virtual' drawing objects by // the corresponding 'master' drawing objects. -DBG_ASSERT(0, "STRIP"); return NULL; //STRIP001 SwDrawView::ReplaceMarkedDrawVirtObjs( rDrawView ); +DBG_BF_ASSERT(0, "STRIP"); return NULL; //STRIP001 SwDrawView::ReplaceMarkedDrawVirtObjs( rDrawView ); //STRIP001 //STRIP001 const SdrMarkList &rMrkList = rDrawView.GetMarkList(); //STRIP001 SwDrawFrmFmt *pFmt; @@ -279,7 +279,7 @@ DBG_ASSERT(0, "STRIP"); return NULL; //STRIP001 SwDrawView::ReplaceMarkedDraw /*N*/ void SwDoc::UnGroupSelection( SdrView& rDrawView ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 int bUndo = DoesUndo(); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 int bUndo = DoesUndo(); //STRIP001 if( bUndo ) //STRIP001 ClearRedo(); //STRIP001 @@ -804,7 +804,7 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLa \************************************************************************/ /*N*/ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (pInfo) //STRIP001 { //STRIP001 const SvxFieldItem& rField = pInfo->GetField(); diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx index 08bde6a4a..8efdee9e2 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docedt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -728,7 +728,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* ) /*N*/ /*N*/ if( pACEWord ) // Aufnahme in die Autokorrektur /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pACEWord->IsDeleted() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pACEWord->IsDeleted() ) //STRIP001 /*?*/ pACEWord->CheckChar( rPos, c ); //STRIP001 /*?*/ delete pACEWord, pACEWord = 0; /*N*/ } @@ -759,7 +759,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* ) /*N*/ /*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( rPos.nNode, rPos.nContent.GetIndex() - 1, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( rPos.nNode, rPos.nContent.GetIndex() - 1, //STRIP001 /*?*/ rPos.nNode, rPos.nContent.GetIndex() ); //STRIP001 /*?*/ if( IsRedlineOn() ) //STRIP001 /*?*/ AppendRedline( new SwRedline( REDLINE_INSERT, aPam )); @@ -1410,7 +1410,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* ) /*N*/ /*N*/ // verschiebe noch alle Bookmarks/TOXMarks /*N*/ if( aBkmkArr.Count() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ::_RestoreCntntIdx( pDoc, aBkmkArr, aIdx.GetIndex() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ::_RestoreCntntIdx( pDoc, aBkmkArr, aIdx.GetIndex() ); /*N*/ /*N*/ pDoc->DoUndo( bDoUndo ); /*N*/ @@ -1425,7 +1425,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* ) /*N*/ pDoc->GetNodes().Delete( aOldIdx, 1 ); /*N*/ } /*N*/ else -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwTxtNode* pDelNd = aIdx.GetNode().GetTxtNode(); //STRIP001 /*?*/ if( pTxtNd->Len() ) //STRIP001 /*?*/ pDelNd->FmtToTxtAttr( pTxtNd ); @@ -1466,7 +1466,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* ) /*N*/ { /*N*/ if( IsRedlineOn() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 sal_uInt16 nUndoSize = 0; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 sal_uInt16 nUndoSize = 0; //STRIP001 /*?*/ SwUndoRedlineDelete* pUndo = 0; //STRIP001 /*?*/ SwRedlineMode eOld = GetRedlineMode(); //STRIP001 checkRedlining(eOld); @@ -1536,7 +1536,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* ) /*N*/ /*N*/ if( pACEWord ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // ggfs. das gesicherte Word fuer die Ausnahme +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // ggfs. das gesicherte Word fuer die Ausnahme //STRIP001 /*?*/ if( pACEWord->IsDeleted() || pStt->nNode != pEnd->nNode || //STRIP001 /*?*/ pStt->nContent.GetIndex() + 1 != pEnd->nContent.GetIndex() || //STRIP001 /*?*/ !pACEWord->CheckDelChar( *pStt )) @@ -1674,7 +1674,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* ) /*?*/ } while( sal_False ); /*?*/ /*?*/ if( !IsIgnoreRedline() && GetRedlineTbl().Count() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ::com::pressRedlines(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ::com::pressRedlines(); /*?*/ SetModified(); /*?*/ /*?*/ return sal_True; @@ -1995,7 +1995,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* ) /*N*/ sal_Bool SwDoc::Replace( SwPaM& rPam, const String& rStr, sal_Bool bRegExpRplc ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark() ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark() ) //STRIP001 return sal_False; //STRIP001 //STRIP001 sal_Bool bJoinTxt, bJoinPrev; diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx index 9472b2240..580cd1935 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docfld.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -270,7 +270,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ pUpdtFlds->InsertFldType( *pNew ); /*N*/ break; /*N*/ case RES_AUTHORITY : -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ((SwAuthorityFieldType*)pNew)->SetDoc( this ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ((SwAuthorityFieldType*)pNew)->SetDoc( this ); /*?*/ break; /*N*/ } /*N*/ @@ -360,7 +360,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ { /*N*/ case RES_SETEXPFLD: /*N*/ case RES_USERFLD: -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pUpdtFlds->RemoveFldType( *pTmp ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pUpdtFlds->RemoveFldType( *pTmp ); /*?*/ // kein break; /*N*/ case RES_DDEFLD: /*?*/ if( pTmp->GetDepends() && !IsUsed( *pTmp ) ) @@ -440,7 +440,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, BOOL bCloseDB ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // Modify() fuer jeden Feldtypen rufen, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Modify() fuer jeden Feldtypen rufen, //STRIP001 // abhaengige SwTxtFld werden benachrichtigt ... //STRIP001 //STRIP001 for( USHORT i=0; i < pFldTypes->Count(); ++i) @@ -588,7 +588,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*?*/ // ist es die gesuchte Tabelle ?? /*?*/ if( &pTblNd->GetTable() == pUpdtFld->pTbl ) /*?*/ // zur relativen Darstellung -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pFld->ToRelBoxNm( pUpdtFld->pTbl ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pFld->ToRelBoxNm( pUpdtFld->pTbl ); /*?*/ break; /*?*/ } /*N*/ } @@ -609,7 +609,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ if( 0 != (pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i ) ) && /*N*/ ((SwTblBoxFormula*)pItem)->GetDefinedIn() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwTblBoxFormula*)pItem)->ChangeState( pHt ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwTblBoxFormula*)pItem)->ChangeState( pHt ); /*?*/ } /*?*/ /*?*/ @@ -662,7 +662,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ SwFrm* pFrm = 0; /*N*/ if( pTblNd->GetIndex() < GetNodes().GetEndOfExtras().GetIndex() ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // steht im Sonderbereich, wird teuer !! +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // steht im Sonderbereich, wird teuer !! //STRIP001 /*?*/ Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !! //STRIP001 /*?*/ pFrm = rTxtNd.GetFrm( &aPt ); //STRIP001 /*?*/ if( pFrm ) @@ -688,7 +688,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ pFld->CalcField( aPara ); /*N*/ if( aPara.IsStackOverFlow() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( aPara.CalcWithStackOverflow() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( aPara.CalcWithStackOverflow() ) //STRIP001 /*?*/ pFld->CalcField( aPara ); //STRIP001 /*?*/ #ifndef PRODUCT //STRIP001 /*?*/ else @@ -709,7 +709,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ if( 0 != (pItem = GetAttrPool().GetItem( RES_BOXATR_FORMULA, i ) ) && /*N*/ ((SwTblBoxFormula*)pItem)->GetDefinedIn() && /*N*/ !((SwTblBoxFormula*)pItem)->IsValid() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwTblBoxFormula* pFml = (SwTblBoxFormula*)pItem; //STRIP001 /*?*/ SwTableBox* pBox = pFml->GetTableBox(); //STRIP001 /*?*/ if( pBox && pBox->GetSttNd() && @@ -1010,7 +1010,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ if( pFirst->IsTxtNode() && pNext->IsTxtNode() && /*N*/ ( pFirst->FindFlyStartNode() || pNext->FindFlyStartNode() )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 return ::IsFrameBehind( *(SwTxtNode*)pNext, nCntnt, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 return ::IsFrameBehind( *(SwTxtNode*)pNext, nCntnt, //STRIP001 /*?*/ *(SwTxtNode*)pFirst, nCntnt ); /*N*/ } /*N*/ return pFirstStt->GetIndex() < pNextStt->GetIndex(); @@ -1146,7 +1146,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ /*N*/ if( RES_SETEXPFLD == nFldWhich ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwSbxValue aValue; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwSbxValue aValue; //STRIP001 /*?*/ if( GSE_EXPR & pFld->GetSubType() ) //STRIP001 /*?*/ aValue.PutDouble( ((SwSetExpField*)pFld)->GetValue() ); //STRIP001 /*?*/ else @@ -1453,7 +1453,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ SwDBData aDBData(((SwDBField*)pFld)->GetDBData()); /*N*/ /*N*/ if( pMgr->IsDataSourceOpen(aDBData.sDataSource, aDBData.sCommand, sal_False)) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 aCalc.VarChange( sDBNumNm, pMgr->GetSelectedRecordId(aDBData.sDataSource, aDBData.sCommand, aDBData.nCommandType)); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 aCalc.VarChange( sDBNumNm, pMgr->GetSelectedRecordId(aDBData.sDataSource, aDBData.sCommand, aDBData.nCommandType)); /*N*/ /*N*/ const String& rName = pFld->GetTyp()->GetName(); /*N*/ @@ -1488,7 +1488,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*?*/ if( (!pUpdtFld || pUpdtFld == pTxtFld ) /*?*/ && pGFld->IsInBodyTxt() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 LookString( pHashStrTbl, nStrFmtCnt, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 LookString( pHashStrTbl, nStrFmtCnt, //STRIP001 /*?*/ pGFld->GetFormula(), aNew ); //STRIP001 /*?*/ pGFld->ChgExpStr( aNew ); /*?*/ } @@ -1553,7 +1553,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ BYTE nLvl = pSFldTyp->GetOutlineLvl(); /*N*/ if( MAXLEVEL > nLvl ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // dann teste, ob die Nummer neu aufsetzen muss +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // dann teste, ob die Nummer neu aufsetzen muss //STRIP001 /*?*/ pSeqNd = GetNodes()[ (*ppSortLst)->GetNode() ]; //STRIP001 /*?*/ //STRIP001 /*?*/ const SwTxtNode* pOutlNd = pSeqNd-> @@ -1576,7 +1576,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ pSFld->SetValue( nErg ); /*N*/ /*N*/ if( pSeqNd ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pSFldTyp->SetChapter( *pSFld, *pSeqNd ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pSFldTyp->SetChapter( *pSFld, *pSeqNd ); /*N*/ } /*N*/ } /*N*/ } @@ -2250,7 +2250,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ void SwDoc::SetFixFields( BOOL bOnlyTimeDate, const DateTime* pNewDateTime ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bIsModified = IsModified(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bIsModified = IsModified(); //STRIP001 //STRIP001 ULONG nDate, nTime; //STRIP001 if( pNewDateTime ) @@ -2453,7 +2453,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bIsModified = IsModified(); /*N*/ GetBodyNode( rFld, nWhich ); /*N*/ else /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // ueber den pTxtFld Pointer suchen. Ist zwar eine Sortierte +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // ueber den pTxtFld Pointer suchen. Ist zwar eine Sortierte /*?*/ // Liste, aber nach Node-Positionen sortiert. Bis dieser /*?*/ // bestimmt ist, ist das Suchen nach dem Pointer schon fertig //STRIP001 /*?*/ for( USHORT n = 0; n < pFldSortLst->Count(); ++n ) @@ -2531,7 +2531,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bIsModified = IsModified(); /*M*/ /*M*/ // so, erst jetzt alle sortiert in die Liste eintragen /*M*/ for( n = 0; n < aTmpArr.Count(); ++n ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 GetBodyNode( *rDoc.GetNodes()[ aTmpArr[ n ] ]->GetSectionNode() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 GetBodyNode( *rDoc.GetNodes()[ aTmpArr[ n ] ]->GetSectionNode() ); /*M*/ } /*M*/ /*M*/ String sTrue( String::CreateFromAscii( diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx index d9f4bdea6..8ad8ec136 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docfly.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -278,7 +278,7 @@ extern USHORT GetHtmlMode( const SwDocShell* ); /*N*/ case FLY_IN_CNTNT: /*N*/ if( pFlyFmt && rAnch.GetCntntAnchor() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwFrm* pOld = ((SwFlyFrmFmt*)pFlyFmt)->GetFrm( &aRet, FALSE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwFrm* pOld = ((SwFlyFrmFmt*)pFlyFmt)->GetFrm( &aRet, FALSE ); //STRIP001 /*?*/ if( pOld ) //STRIP001 /*?*/ aRet = pOld->Frm().Pos(); /*N*/ } @@ -299,7 +299,7 @@ extern USHORT GetHtmlMode( const SwDocShell* ); /*N*/ case FLY_AT_FLY: // LAYER_IMPL /*?*/ if( rAnch.GetCntntAnchor() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwFlyFrmFmt* pFmt = (SwFlyFrmFmt*)rAnch.GetCntntAnchor()-> +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwFlyFrmFmt* pFmt = (SwFlyFrmFmt*)rAnch.GetCntntAnchor()-> //STRIP001 /*?*/ nNode.GetNode().GetFlyFmt(); //STRIP001 /*?*/ const SwFrm* pOld = pFmt ? pFmt->GetFrm( &aRet, FALSE ) : 0; //STRIP001 /*?*/ if( pOld ) @@ -1066,7 +1066,7 @@ extern USHORT GetHtmlMode( const SwDocShell* ); * --------------------------------------------------*/ /*N*/ int SwDoc::Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 int nErr = Chainable( rSource, rDest ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 int nErr = Chainable( rSource, rDest ); //STRIP001 if ( !nErr ) //STRIP001 { //STRIP001 StartUndo( UNDO_CHAINE ); @@ -1113,7 +1113,7 @@ extern USHORT GetHtmlMode( const SwDocShell* ); * --------------------------------------------------*/ /*N*/ void SwDoc::Unchain( SwFrmFmt &rFmt ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 SwFmtChain aChain( rFmt.GetChain() ); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFmtChain aChain( rFmt.GetChain() ); //STRIP001 if ( aChain.GetNext() ) //STRIP001 { //STRIP001 StartUndo( UNDO_UNCHAIN ); diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx index 9c0ededeb..e9c842edb 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docfmt.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -429,7 +429,7 @@ struct ParaRstFmt /*M*/ nPtPos = *pURLAttr->GetEnd(); /*M*/ } /*M*/ else -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ Boundary aBndry; //STRIP001 /*?*/ if( pBreakIt->xBreak.is() ) //STRIP001 /*?*/ aBndry = pBreakIt->xBreak->getWordBoundary( @@ -459,7 +459,7 @@ struct ParaRstFmt /*M*/ SwDataChanged aTmp( *pPam, 0 ); /*M*/ SwHistory* pHst = 0; /*M*/ if( DoesUndo() ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ClearRedo(); //STRIP001 /*?*/ SwUndoRstAttr* pUndo = new SwUndoRstAttr( rRg, //STRIP001 /*?*/ bTxtAttr ? RES_CONDTXTFMTCOLL : RES_TXTFMTCOLL ); @@ -498,7 +498,7 @@ struct ParaRstFmt /*M*/ SwNodeIndex aTmpStt( pStt->nNode ); /*M*/ SwNodeIndex aTmpEnd( pEnd->nNode ); /*M*/ if( pStt->nContent.GetIndex() ) // nur ein Teil -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // dann spaeter aufsetzen und alle CharFmtAttr -> TxtFmtAttr //STRIP001 /*?*/ SwTxtNode* pTNd = aTmpStt.GetNode().GetTxtNode(); //STRIP001 /*?*/ if( pTNd && pTNd->GetpSwAttrSet() && pTNd->GetpSwAttrSet()->Count() ) @@ -646,7 +646,7 @@ struct ParaRstFmt /*N*/ if( pDoc->IsRedlineOn() || (!pDoc->IsIgnoreRedline() && /*N*/ pDoc->GetRedlineTbl().Count() )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( pStt->nNode, pStt->nContent.GetIndex()-1, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( pStt->nNode, pStt->nContent.GetIndex()-1, //STRIP001 /*?*/ pStt->nNode, pStt->nContent.GetIndex() ); //STRIP001 /*?*/ //STRIP001 /*?*/ if( pUndo ) @@ -683,7 +683,7 @@ struct ParaRstFmt /*N*/ if( pDoc->IsRedlineOn() || (!pDoc->IsIgnoreRedline() && /*N*/ pDoc->GetRedlineTbl().Count() ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // wurde Text-Inhalt eingefuegt? (RefMark/TOXMarks ohne Ende) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // wurde Text-Inhalt eingefuegt? (RefMark/TOXMarks ohne Ende) //STRIP001 /*?*/ BOOL bTxtIns = nInsCnt != rSt.GetIndex(); //STRIP001 /*?*/ // wurde Inhalt eingefuegt oder ueber die Selektion gesetzt? //STRIP001 /*?*/ SwPaM aPam( pStt->nNode, bTxtIns ? nInsCnt + 1 : nEnd, @@ -780,7 +780,7 @@ struct ParaRstFmt /*N*/ /*N*/ if( pNode->IsTxtNode() && aCharSet.Count() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = (SwTxtNode*)pNode; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = (SwTxtNode*)pNode; //STRIP001 /*?*/ const SwIndex& rSt = pStt->nContent; //STRIP001 /*?*/ USHORT nMkPos, nPtPos = rSt.GetIndex(); //STRIP001 /*?*/ const String& rStr = pTxtNd->GetTxt(); @@ -860,7 +860,7 @@ struct ParaRstFmt /*N*/ /*N*/ if( pDoc->IsRedlineOn() && aCharSet.Count() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pUndo ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pUndo ) //STRIP001 /*?*/ pUndo->SaveRedlineData( rRg, FALSE ); //STRIP001 /*?*/ pDoc->AppendRedline( new SwRedline( REDLINE_FORMAT, rRg )); /*N*/ } @@ -1363,7 +1363,7 @@ struct ParaRstFmt /*N*/ USHORT SwDoc::GetTblFrmFmtCount(BOOL bUsed) const /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 USHORT nCount = pTblFrmFmtTbl->Count(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 USHORT nCount = pTblFrmFmtTbl->Count(); //STRIP001 if(bUsed) //STRIP001 { //STRIP001 SwAutoFmtGetDocNode aGetHt( &aNodes ); @@ -1655,7 +1655,7 @@ struct ParaRstFmt //FEATURE::CONDCOLL /*?*/ if( RES_CONDTXTFMTCOLL == rColl.Which() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pNewColl = new SwConditionTxtFmtColl( GetAttrPool(), rColl.GetName(), +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pNewColl = new SwConditionTxtFmtColl( GetAttrPool(), rColl.GetName(), //STRIP001 /*?*/ pParent); //STRIP001 /*?*/ pTxtFmtCollTbl->Insert( pNewColl, pTxtFmtCollTbl->Count() ); //STRIP001 /*?*/ pNewColl->SetAuto( FALSE ); @@ -1723,7 +1723,7 @@ struct ParaRstFmt /*?*/ pParent = CopyGrfColl( *(SwGrfFmtColl*)rColl.DerivedFrom() ); /*?*/ /*?*/ // falls nicht, so kopiere sie -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pNewColl = MakeGrfFmtColl( rColl.GetName(), pParent ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pNewColl = MakeGrfFmtColl( rColl.GetName(), pParent ); /*?*/ /*?*/ // noch die Attribute kopieren /*?*/ pNewColl->CopyAttrs( rColl ); @@ -1898,7 +1898,7 @@ struct ParaRstFmt /*N*/ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc, /*N*/ BOOL bCopyPoolIds ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 FASTBOOL bNotifyLayout = FALSE; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 FASTBOOL bNotifyLayout = FALSE; //STRIP001 //STRIP001 rDstDesc.SetLandscape( rSrcDesc.GetLandscape() ); //STRIP001 rDstDesc.SetNumType( rSrcDesc.GetNumType() ); diff --git a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx index a6ecbf4ba..e693b9213 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docftn.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:48:58 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -214,7 +214,7 @@ namespace binfilter { /*N*/ void SwEndNoteInfo::SetFtnTxtColl(SwTxtFmtColl& rFmt) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rFmt.Add(this); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rFmt.Add(this); /*N*/ } /*N*/ SwCharFmt* SwEndNoteInfo::GetCharFmt(SwDoc &rDoc) const @@ -329,7 +329,7 @@ namespace binfilter { /*N*/ /*N*/ if( DoesUndo() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); //STRIP001 /*?*/ AppendUndo( new SwUndoFtnInfo( rOld ) ); /*N*/ } /*N*/ @@ -355,7 +355,7 @@ namespace binfilter { /*?*/ GetRootFrm()->RemoveFtns(); /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 GetRootFrm()->UpdateFtnNums(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 GetRootFrm()->UpdateFtnNums(); //STRIP001 if ( bFtnDesc ) //STRIP001 /*?*/ GetRootFrm()->CheckFtnPageDescs( FALSE ); //STRIP001 /*?*/ if ( bExtra ) @@ -394,7 +394,7 @@ namespace binfilter { /*N*/ { /*N*/ if( DoesUndo() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); //STRIP001 /*?*/ AppendUndo( new SwUndoEndNoteInfo( GetEndNoteInfo() ) ); /*N*/ } /*N*/ @@ -414,7 +414,7 @@ namespace binfilter { /*N*/ if ( GetRootFrm() ) /*N*/ { /*?*/ if ( bFtnDesc ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 GetRootFrm()->CheckFtnPageDescs( TRUE ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 GetRootFrm()->CheckFtnPageDescs( TRUE ); /*?*/ if ( bExtra ) /*?*/ { /*?*/ //Fuer die Benachrichtung bezueglich ErgoSum usw. sparen wir uns @@ -489,7 +489,7 @@ namespace binfilter { /*N*/ pTxtFtn->SetNumber( nNumber, &rNumStr ); /*N*/ if( rFtn.IsEndNote() != bIsEndNote ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwFmtFtn&)rFtn).SetEndNote( bIsEndNote ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwFmtFtn&)rFtn).SetEndNote( bIsEndNote ); //STRIP001 /*?*/ bTypeChgd = TRUE; //STRIP001 /*?*/ pTxtFtn->CheckCondColl(); /*N*/ } @@ -516,7 +516,7 @@ namespace binfilter { /*?*/ pTxtFtn->SetNumber( nNumber, &rNumStr ); /*?*/ if( rFtn.IsEndNote() != bIsEndNote ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwFmtFtn&)rFtn).SetEndNote( bIsEndNote ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwFmtFtn&)rFtn).SetEndNote( bIsEndNote ); //STRIP001 /*?*/ bTypeChgd = TRUE; //STRIP001 /*?*/ pTxtFtn->CheckCondColl(); /*?*/ } @@ -540,7 +540,7 @@ namespace binfilter { /*N*/ rFtnArr.UpdateAllFtn(); /*N*/ } /*N*/ else if( GetRootFrm() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 GetRootFrm()->UpdateFtnNums(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 GetRootFrm()->UpdateFtnNums(); /*N*/ } /*N*/ else /*?*/ delete pUndo; diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx index 4b8ac585f..8079f6201 100644 --- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_doclay.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-05-04 14:12:37 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -342,7 +342,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which) /*N*/ /*N*/ case RND_DRAW_OBJECT: /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pFmt = MakeDrawFrmFmt( aEmptyStr, GetDfltFrmFmt() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pFmt = MakeDrawFrmFmt( aEmptyStr, GetDfltFrmFmt() ); //STRIP001 /*?*/ if( pSet ) // noch ein paar Attribute setzen ? //STRIP001 /*?*/ pFmt->SetAttr( *pSet ); //STRIP001 /*?*/ @@ -391,13 +391,13 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which) /*N*/ const SwFmtChain &rChain = pFmt->GetChain(); /*N*/ if ( rChain.GetPrev() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFmtChain aChain( rChain.GetPrev()->GetChain() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFmtChain aChain( rChain.GetPrev()->GetChain() ); //STRIP001 /*?*/ aChain.SetNext( rChain.GetNext() ); //STRIP001 /*?*/ SetAttr( aChain, *rChain.GetPrev() ); /*N*/ } /*N*/ if ( rChain.GetNext() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFmtChain aChain( rChain.GetNext()->GetChain() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFmtChain aChain( rChain.GetNext()->GetChain() ); //STRIP001 /*?*/ aChain.SetPrev( rChain.GetPrev() ); //STRIP001 /*?*/ SetAttr( aChain, *rChain.GetNext() ); /*N*/ } @@ -433,7 +433,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which) /*N*/ const sal_uInt16 nWh = pFmt->Which(); /*N*/ if( DoesUndo() && (RES_FLYFRMFMT == nWh || RES_DRAWFRMFMT == nWh) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // erstmal werden alle Undo - Objecte geloescht. +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // erstmal werden alle Undo - Objecte geloescht. //STRIP001 /*?*/ ClearRedo(); //STRIP001 /*?*/ AppendUndo( new SwUndoDelLayFmt( pFmt )); /*N*/ } @@ -596,7 +596,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which) /*N*/ } /*N*/ /*N*/ if( DoesUndo() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ClearRedo(); //STRIP001 /*?*/ AppendUndo( new SwUndoInsLayFmt( pDest )); /*N*/ } @@ -627,7 +627,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which) /*N*/ pDest->SetAttr( rNewAnchor ); /*N*/ /*N*/ if( DoesUndo() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ClearRedo(); //STRIP001 /*?*/ AppendUndo( new SwUndoInsLayFmt( pDest )); /*N*/ } @@ -1141,7 +1141,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which) /*N*/ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts, /*N*/ const SwPaM* pCmpRange, sal_Bool bDrawAlso ) const /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 SwPosFlyFrm *pFPos = 0; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPosFlyFrm *pFPos = 0; //STRIP001 const SwPosition* pAPos; //STRIP001 SwFrmFmt *pFly; //STRIP001 @@ -2163,7 +2163,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 SwPosFlyFrm *pFPos = 0; /*?*/ /*?*/ if( !pItem ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwPageDesc* pPgDsc = pNd->FindPageDesc( FALSE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwPageDesc* pPgDsc = pNd->FindPageDesc( FALSE ); //STRIP001 /*?*/ if( pPgDsc ) //STRIP001 /*?*/ pItem = &pPgDsc->GetMaster().GetFrmDir(); /*?*/ } diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx index 44ff28013..beffbd628 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docnum.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-05-04 14:13:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -880,7 +880,7 @@ namespace binfilter { /*N*/ /*N*/ } /*N*/ else if( rRule.IsAutoRule() && !(*pNew == rRule) ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // die Rule existiert schon, wurde aber veraendert. Dann muss hier //STRIP001 /*N*/ // entschieden werden, in wie weit eine neue erzeugt wird oder //STRIP001 /*N*/ // die aktuelle geupdatet wird. @@ -1020,7 +1020,7 @@ namespace binfilter { /*N*/ void SwDoc::SetNumRuleStart( const SwPosition& rPos, BOOL bFlag ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode(); //STRIP001 const SwNumRule* pRule; //STRIP001 if( pTxtNd && pTxtNd->GetNum() && 0 != ( pRule = pTxtNd->GetNumRule() ) //STRIP001 && bFlag != pTxtNd->GetNum()->IsStart()) @@ -1082,7 +1082,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().Get /*N*/ SwHistory* pHistory = 0; /*N*/ if( DoesUndo() && pRule->IsAutoRule() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); //STRIP001 /*?*/ pUndo = new SwUndoInsNum( *pRule, rRule ); //STRIP001 /*?*/ pHistory = pUndo->GetHistory(); /*?*/ AppendUndo( pUndo ); @@ -1090,7 +1090,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().Get /*N*/ ::binfilter::lcl_ChgNumRule( *this, rRule, pHistory ); /*N*/ /*N*/ if( pUndo ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pUndo->SetLRSpaceEndPos(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pUndo->SetLRSpaceEndPos(); /*N*/ /*N*/ SetModified(); /*N*/ } @@ -1112,7 +1112,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().Get /*N*/ for( SwFrm* pFrm = (SwFrm*)aIter.First( TYPE(SwFrm) ); /*N*/ pFrm; pFrm = (SwFrm*)aIter.Next() ) /*N*/ if( ((SwTxtFrm*)pFrm)->HasAnimation() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ((SwTxtFrm*)pFrm)->StopAnimation( pOut ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ((SwTxtFrm*)pFrm)->StopAnimation( pOut ); /*N*/ } /*N*/ } /*N*/ } @@ -1275,7 +1275,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 SwTxtNode* pTxtNd = rPos.nNode.GetNode().Get /*N*/ BOOL SwDoc::DelNumRules( const SwPaM& rPam ) /*N*/ { - DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ULONG nStt = rPam.GetPoint()->nNode.GetIndex(), + DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ULONG nStt = rPam.GetPoint()->nNode.GetIndex(), //STRIP001 nEnd = rPam.GetMark()->nNode.GetIndex(); //STRIP001 if( nStt > nEnd ) //STRIP001 { diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx index 1e866a105..3ebc64068 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docredln.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: aw $ $Date: 2004-04-23 14:05:50 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,7 +158,7 @@ namespace binfilter { /*N*/ /*N*/ // verify valid redline positions /*N*/ for( USHORT i = 0; i < rTbl.Count(); ++i ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 lcl_CheckPam( rTbl[ i ] ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 lcl_CheckPam( rTbl[ i ] ); /*N*/ /*N*/ for( USHORT j = 0; j < rTbl.Count(); ++j ) /*N*/ { @@ -209,7 +209,7 @@ namespace binfilter { /*N*/ pFnc = &SwRedline::Hide; /*N*/ break; /*N*/ case REDLINE_SHOW_DELETE: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pFnc = &SwRedline::ShowOriginal; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pFnc = &SwRedline::ShowOriginal; /*?*/ break; /*N*/ /*N*/ default: @@ -269,7 +269,7 @@ Verhalten von Delete-Redline: /*N*/ BOOL SwDoc::AppendRedline( SwRedline* pNewRedl, BOOL bCallDelete ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 _CHECK_REDLINE( this ) +DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 _CHECK_REDLINE( this ) //STRIP001 //STRIP001 if( IsRedlineOn() && !IsShowOriginal( eRedlineMode ) && //STRIP001 pNewRedl->GetAuthorString().Len() ) @@ -1178,7 +1178,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 _CHECK_REDLINE( this /*N*/ /*N*/ if( bSaveInUndo && DoesUndo() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwUndoRedline* pUndo = new SwUndoRedline( UNDO_REDLINE, rRange ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwUndoRedline* pUndo = new SwUndoRedline( UNDO_REDLINE, rRange ); //STRIP001 /*?*/ if( pUndo->GetRedlSaveCount() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ ClearRedo(); @@ -1195,7 +1195,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 _CHECK_REDLINE( this /*N*/ GetRedline( *pStt, &n ); /*N*/ for( ; n < pRedlineTbl->Count() ; ++n ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwRedline* pRedl = (*pRedlineTbl)[ n ]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwRedline* pRedl = (*pRedlineTbl)[ n ]; //STRIP001 /*?*/ if( USHRT_MAX != nDelType && nDelType != pRedl->GetType() ) //STRIP001 /*?*/ continue; //STRIP001 /*?*/ @@ -1316,7 +1316,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 _CHECK_REDLINE( this /*N*/ const ULONG nNdIdx = rNd.GetIndex(); /*N*/ for( USHORT n = 0; n < pRedlineTbl->Count() ; ++n ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwRedline* pTmp = (*pRedlineTbl)[ n ]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwRedline* pTmp = (*pRedlineTbl)[ n ]; //STRIP001 /*?*/ ULONG nPt = pTmp->GetPoint()->nNode.GetIndex(), //STRIP001 /*?*/ nMk = pTmp->GetMark()->nNode.GetIndex(); //STRIP001 /*?*/ if( nPt < nMk ) { long nTmp = nMk; nMk = nPt; nPt = nTmp; } @@ -1337,7 +1337,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 _CHECK_REDLINE( this /*N*/ register USHORT nO = pRedlineTbl->Count(), nM, nU = 0; /*N*/ if( nO > 0 ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 nO--; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 nO--; //STRIP001 /*?*/ while( nU <= nO ) //STRIP001 /*?*/ { //STRIP001 /*?*/ nM = nU + ( nO - nU ) / 2; @@ -2894,7 +2894,7 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos, //STRIP001 } /*N*/ void SwRedline::Show( USHORT nLoop ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( 1 <= nLoop ) //STRIP001 { //STRIP001 SwDoc* pDoc = GetDoc(); @@ -2926,7 +2926,7 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos, /*N*/ } /*N*/ void SwRedline::Hide( USHORT nLoop ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwDoc* pDoc = GetDoc(); //STRIP001 SwRedlineMode eOld = pDoc->GetRedlineMode(); //STRIP001 pDoc->SetRedlineMode_intern( eOld | REDLINE_IGNORE ); @@ -3421,7 +3421,7 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos, // fuers Undo /*N*/ void SwRedline::SetContentIdx( const SwNodeIndex* pIdx ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( pIdx && !pCntntSect ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( pIdx && !pCntntSect ) //STRIP001 { //STRIP001 pCntntSect = new SwNodeIndex( *pIdx ); //STRIP001 bIsVisible = FALSE; diff --git a/binfilter/bf_sw/source/core/doc/sw_docruby.cxx b/binfilter/bf_sw/source/core/doc/sw_docruby.cxx index 1721d95a6..db7ba0d7e 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docruby.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docruby.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docruby.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:02 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -177,7 +177,7 @@ using namespace ::com::sun::star::i18n; /*N*/ USHORT SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, /*N*/ USHORT nMode ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 StartUndo( UNDO_SETRUBYATTR ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 StartUndo( UNDO_SETRUBYATTR ); //STRIP001 /*?*/ SvUShortsSort aDelArr; //STRIP001 /*?*/ aDelArr.Insert( RES_TXTATR_CJK_RUBY ); //STRIP001 /*?*/ @@ -261,7 +261,7 @@ using namespace ::com::sun::star::i18n; /*N*/ BOOL SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, /*N*/ USHORT nMode ) /*N*/ { - DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 // Point must be the startposition, Mark is optional the end position + DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 // Point must be the startposition, Mark is optional the end position //STRIP001 SwPosition* pPos = rPam.GetPoint(); //STRIP001 const SwTxtNode* pTNd = pPos->nNode.GetNode().GetTxtNode(); //STRIP001 const String* pTxt = &pTNd->GetTxt(); diff --git a/binfilter/bf_sw/source/core/doc/sw_docsort.cxx b/binfilter/bf_sw/source/core/doc/sw_docsort.cxx index 541d46b52..e902e3f3c 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docsort.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docsort.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docsort.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:02 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -416,7 +416,7 @@ using namespace ::com::sun::star::lang; /*N*/ BOOL SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // pruefen ob Rahmen im Text +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // pruefen ob Rahmen im Text //STRIP001 const SwPosition *pStart = rPaM.Start(), *pEnd = rPaM.End(); //STRIP001 // Index auf den Start der Selektion //STRIP001 @@ -579,7 +579,7 @@ using namespace ::com::sun::star::lang; /*N*/ BOOL SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // uebers SwDoc fuer Undo !! +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // uebers SwDoc fuer Undo !! //STRIP001 ASSERT( rBoxes.Count(), "keine gueltige Box-Liste" ); //STRIP001 SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode(); //STRIP001 if( !pTblNd ) diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx index f141efec7..4166e0240 100644 --- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_doctxm.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-05-04 14:11:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -297,7 +297,7 @@ typedef LinkStruct* LinkStructPtr; /*N*/ void SwDoc::Delete( SwTOXMark* pTOXMark ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 // hole den TextNode und +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // hole den TextNode und //STRIP001 SwTxtTOXMark* pTxtTOXMark = pTOXMark->GetTxtTOXMark(); //STRIP001 ASSERT( pTxtTOXMark, "Kein TxtTOXMark, kann nicht geloescht werden" ); //STRIP001 @@ -494,7 +494,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 // hole den TextNode und /*N*/ pSectNd->SetNewSection( pNew ); /*N*/ /*N*/ if( bExpand ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // OD 19.03.2003 #106329# - add value for 2nd parameter = true to //STRIP001 // indicate, that a creation of a new table of content has to be performed. //STRIP001 // Value of 1st parameter = default value. @@ -663,7 +663,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 // hole den TextNode und /*N*/ BOOL SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); return TRUE;//STRIP001 // its only delete the TOX, not the nodes +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return TRUE;//STRIP001 // its only delete the TOX, not the nodes //STRIP001 BOOL bRet = FALSE; //STRIP001 ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "keine TOXBaseSection!" ); //STRIP001 @@ -963,7 +963,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 // hole den TextNode und /*N*/ void SwTOXBaseSection::Update(const SfxItemSet* pAttr, /*N*/ const bool _bNewTOX ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 const SwSectionNode* pSectNd; //STRIP001 if( !SwTOXBase::GetRegisteredIn()->GetDepends() || //STRIP001 !GetFmt() || 0 == (pSectNd = GetFmt()->GetSectionNode() ) || diff --git a/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx b/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx index d020792d7..2ef7d5b2c 100644 --- a/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_fmtcol.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -352,7 +352,7 @@ namespace binfilter { /*N*/ int SwCollCondition::operator==( const SwCollCondition& rCmp ) const /*N*/ { -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 int nRet = 0; +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 int nRet = 0; //STRIP001 if( nCondition == rCmp.nCondition ) //STRIP001 { //STRIP001 if( USRFLD_EXPRESSION & nCondition ) @@ -419,7 +419,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 int nRet = 0; /*N*/ void SwConditionTxtFmtColl::InsertCondition( const SwCollCondition& rCond ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( USHORT n = 0; n < aCondColls.Count(); ++n ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( USHORT n = 0; n < aCondColls.Count(); ++n ) //STRIP001 if( *aCondColls[ n ] == rCond ) //STRIP001 { //STRIP001 aCondColls.DeleteAndDestroy( n ); diff --git a/binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx b/binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx index a324adf9a..99f22fde1 100644 --- a/binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ftnidx.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -346,7 +346,7 @@ namespace binfilter { /*N*/ } /*N*/ /*N*/ if( pDoc->GetRootFrm() && FTNNUM_PAGE == rFtnInfo.eNum ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pDoc->GetRootFrm()->UpdateFtnNums(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pDoc->GetRootFrm()->UpdateFtnNums(); /*N*/ } //STRIP001 void SwFtnIdxs::UpdateFtnInSections() @@ -433,7 +433,7 @@ namespace binfilter { /*N*/ USHORT SwUpdFtnEndNtAtEnd::GetNumber( const SwTxtFtn& rTxtFtn, /*N*/ const SwSectionNode& rNd ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 USHORT nRet = 0, nWh; +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 USHORT nRet = 0, nWh; //STRIP001 SvPtrarr* pArr; //STRIP001 SvUShorts* pNum; //STRIP001 if( rTxtFtn.GetFtn().IsEndNote() ) diff --git a/binfilter/bf_sw/source/core/doc/sw_gctable.cxx b/binfilter/bf_sw/source/core/doc/sw_gctable.cxx index 62b1a5ff8..383aec190 100644 --- a/binfilter/bf_sw/source/core/doc/sw_gctable.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_gctable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_gctable.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:04 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -476,7 +476,7 @@ struct _GCLinePara /*N*/ const SfxPoolItem* pItem; /*N*/ if( SFX_ITEM_SET == pLn->GetFrmFmt()->GetItemState( /*N*/ RES_BACKGROUND, TRUE, &pItem )) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwTableLines& rBoxLns = pBox->GetTabLines(); //STRIP001 /*?*/ for( USHORT nLns = 0; nLns < nLen; ++nLns ) //STRIP001 /*?*/ if( SFX_ITEM_SET != rBoxLns[ nLns ]->GetFrmFmt()-> diff --git a/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx b/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx index c27e747a3..9ec08e85e 100644 --- a/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_htmltbl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:05 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -273,13 +273,13 @@ namespace binfilter { //STRIP001 bPrcWidthOption( bPrcWdth ), bUseRelWidth( FALSE ), //STRIP001 bMustResize( TRUE ), bExportable( TRUE ), bBordersChanged( FALSE ), //STRIP001 bMustNotResize( FALSE ), bMustNotRecalc( FALSE ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 aResizeTimer.SetTimeoutHdl( STATIC_LINK( this, SwHTMLTableLayout, //STRIP001 DelayedResize_Impl ) ); /*N*/ } /*N*/ SwHTMLTableLayout::~SwHTMLTableLayout() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 for( USHORT i=0; i<nCols; i++ ) //STRIP001 delete aColumns[i]; //STRIP001 delete[] aColumns; diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx index e674c7cb9..191263d08 100644 --- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_notxtfrm.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -476,7 +476,7 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx *************************************************************************/ /*N*/ void SwNoTxtFrm::Paint( const SwRect &rRect ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( Frm().IsEmpty() ) //STRIP001 return; //STRIP001 @@ -833,7 +833,7 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx /*N*/ BOOL SwNoTxtFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos, /*N*/ SwCrsrMoveState *pCMS ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( &rPos.nNode.GetNode() != (SwNode*)GetNode() ) //STRIP001 return FALSE; //STRIP001 @@ -870,7 +870,7 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx /*N*/ BOOL SwNoTxtFrm::GetCrsrOfst(SwPosition* pPos, Point& aPoint, /*N*/ const SwCrsrMoveState* ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwCntntNode* pCNd = (SwCntntNode*)GetNode(); //STRIP001 pPos->nNode = *pCNd; //STRIP001 pPos->nContent.Assign( pCNd, 0 ); @@ -906,7 +906,7 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx /*?*/ case RES_GRF_REREAD_AND_INCACHE: /*?*/ if( ND_GRFNODE == GetNode()->GetNodeType() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bCompletePaint = FALSE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bCompletePaint = FALSE; //STRIP001 /*?*/ SwGrfNode* pNd = (SwGrfNode*) GetNode(); //STRIP001 /*?*/ //STRIP001 /*?*/ ViewShell *pVSh = 0; diff --git a/binfilter/bf_sw/source/core/doc/sw_number.cxx b/binfilter/bf_sw/source/core/doc/sw_number.cxx index 3146b9053..3aec83164 100644 --- a/binfilter/bf_sw/source/core/doc/sw_number.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_number.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_number.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -204,7 +204,7 @@ extern const sal_Char __FAR_DATA sBulletFntName[] = "StarSymbol"; ---------------------------------------------------------------------------*/ /*N*/ void SwNumFmt::NotifyGraphicArrived() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( GetCharFmt() ) //STRIP001 UpdateNumNodes( (SwDoc*)GetCharFmt()->GetDoc() ); /*N*/ } @@ -234,7 +234,7 @@ extern const sal_Char __FAR_DATA sBulletFntName[] = "StarSymbol"; ---------------------------------------------------------------------------*/ /*N*/ const Graphic* SwNumFmt::GetGraphic() const -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 //STRIP001 const Graphic* pGrf = 0; //STRIP001 if( GetBrush() && GetCharFmt() ) //STRIP001 pGrf = GetBrush()->GetGraphic( GetCharFmt()->GetDoc()->GetDocShell() ); @@ -282,7 +282,7 @@ extern const sal_Char __FAR_DATA sBulletFntName[] = "StarSymbol"; ---------------------------------------------------------------------------*/ /*N*/ const String& SwNumFmt::GetCharFmtName() const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if((SwCharFmt*)pRegisteredIn) //STRIP001 return ((SwCharFmt*)pRegisteredIn)->GetName(); //STRIP001 else @@ -302,7 +302,7 @@ extern const sal_Char __FAR_DATA sBulletFntName[] = "StarSymbol"; ---------------------------------------------------------------------------*/ /*N*/ void SwNumFmt::SetVertOrient(SvxFrameVertOrient eSet) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SvxNumberFormat::SetVertOrient(eSet); /*N*/ } /* -----------------------------22.02.01 16:05-------------------------------- @@ -341,7 +341,7 @@ extern const sal_Char __FAR_DATA sBulletFntName[] = "StarSymbol"; /*N*/ { /*N*/ if( pMod->IsA( TYPE( SwFmt )) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwNumRuleInfo aInfo( rRuleNm ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwNumRuleInfo aInfo( rRuleNm ); //STRIP001 /*?*/ pMod->GetInfo( aInfo ); //STRIP001 /*?*/ //STRIP001 /*?*/ for( ULONG nFirst = 0, nLast = aInfo.GetList().Count(); @@ -394,7 +394,7 @@ extern const sal_Char __FAR_DATA sBulletFntName[] = "StarSymbol"; ---------------------------------------------------------------------------*/ /*N*/ const SwFmtVertOrient* SwNumFmt::GetGraphicOrientation() const -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 SvxFrameVertOrient eOrient = SvxNumberFormat::GetVertOrient(); //STRIP001 if(SVX_VERT_NONE == eOrient) //STRIP001 return 0; diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx index f114dfcca..fa6dab77e 100644 --- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_poolfmt.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:58 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -359,7 +359,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = { /*N*/ /*N*/ if( pDoc->IsHTMLMode() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ::lcl_SetDfltFont( DEFAULTFONT_LATIN_TEXT, DEFAULTFONT_CJK_TEXT, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ::lcl_SetDfltFont( DEFAULTFONT_LATIN_TEXT, DEFAULTFONT_CJK_TEXT, //STRIP001 /*?*/ DEFAULTFONT_CTL_TEXT, rSet ); /*N*/ } /*N*/ diff --git a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx index 94bb59907..2d28902b6 100644 --- a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swserv.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -394,7 +394,7 @@ namespace binfilter { /*N*/ // noch jemand am Object interessiert ? /*?*/ if( refObj->HasDataLinks() && refObj->ISA( SwServerObject )) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwServerObject& rObj = *(SwServerObject*)&refObj; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwServerObject& rObj = *(SwServerObject*)&refObj; //STRIP001 /*?*/ if( pPos ) //STRIP001 /*?*/ rObj.SendDataChanged( *pPos ); //STRIP001 /*?*/ else diff --git a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx index 3660fa892..c2c0acfaf 100644 --- a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swtable.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:07 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -565,7 +565,7 @@ namespace binfilter { /*N*/ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, /*N*/ FASTBOOL bRefreshHidden, BOOL bCurRowOnly ) const /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //MA 30. Nov. 95: Opt: wenn bHidden gesetzt ist, wird neu das Hidden +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //MA 30. Nov. 95: Opt: wenn bHidden gesetzt ist, wird neu das Hidden //STRIP001 //Array aktualisiert. //STRIP001 if ( bRefreshHidden ) //STRIP001 { @@ -1562,7 +1562,7 @@ namespace binfilter { /*N*/ break; /*N*/ /*N*/ case RES_FINDNEARESTNODE: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( GetFrmFmt() && ((SwFmtPageDesc&)GetFrmFmt()->GetAttr( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( GetFrmFmt() && ((SwFmtPageDesc&)GetFrmFmt()->GetAttr( //STRIP001 /*?*/ RES_PAGEDESC )).GetPageDesc() && //STRIP001 /*?*/ aSortCntBoxes.Count() && //STRIP001 /*?*/ aSortCntBoxes[ 0 ]->GetSttNd()->GetNodes().IsDocNodes() ) @@ -1920,13 +1920,13 @@ namespace binfilter { /*?*/ /*?*/ if( !bNewIsTxtFmt && nOldFmt != nNewFmt || pNewFml ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bChgTxt = TRUE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bChgTxt = TRUE; //STRIP001 /*?*/ double fVal = 0; //STRIP001 /*?*/ if( !pNewVal && SFX_ITEM_SET != GetItemState( //STRIP001 /*?*/ RES_BOXATR_VALUE, FALSE, (const SfxPoolItem**)&pNewVal )) //STRIP001 /*?*/ { //STRIP001 /*?*/ // es wurde noch nie ein Wert gesetzt, dann versuche -//STRIP001 /*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // doch mal den Inhalt auszuwerten +//STRIP001 /*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // doch mal den Inhalt auszuwerten //STRIP001 /*?*/ ULONG nNdPos = pBox->IsValidNumTxtNd( TRUE ); //STRIP001 /*?*/ if( ULONG_MAX != nNdPos ) //STRIP001 /*?*/ { @@ -2006,7 +2006,7 @@ namespace binfilter { /*?*/ // UnlockModify(); /*?*/ /*?*/ -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ChgNumToText( *pBox, nNewFmt ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ChgNumToText( *pBox, nNewFmt ); /*?*/ } /*?*/ } /*N*/ } @@ -2195,7 +2195,7 @@ namespace binfilter { /*N*/ /*N*/ const String& rTxt = pSttNd->GetNodes()[ nNdPos ]->GetTxtNode()->GetTxt(); /*N*/ if( rTxt != sNewTxt ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ChgTextToNum( *this, sNewTxt, pCol, FALSE ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ChgTextToNum( *this, sNewTxt, pCol, FALSE ); /*N*/ } /*N*/ } /*N*/ } diff --git a/binfilter/bf_sw/source/core/doc/sw_tblafmt.cxx b/binfilter/bf_sw/source/core/doc/sw_tblafmt.cxx index 24c75b05e..1e0bd7dc5 100644 --- a/binfilter/bf_sw/source/core/doc/sw_tblafmt.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_tblafmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_tblafmt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -308,7 +308,7 @@ SV_IMPL_PTRARR( _SwTableAutoFmtTbl, SwTableAutoFmt* ) /*?*/int SwBoxAutoFmt::operator==( const SwBoxAutoFmt& rCmp ) const /*?*/{ -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return aFont == rCmp.aFont && +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 return aFont == rCmp.aFont && //STRIP001 aHeight == rCmp.aHeight && //STRIP001 aWeight == rCmp.aWeight && //STRIP001 aPosture == rCmp.aPosture && @@ -378,7 +378,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 return aFont == rCmp.aFont && /*?*/BOOL SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, USHORT nVer ) /*?*/{ -DBG_ASSERT(0, "STRIP");return FALSE; //STRIP001 SfxPoolItem* pNew; +DBG_BF_ASSERT(0, "STRIP");return FALSE; //STRIP001 SfxPoolItem* pNew; //STRIP001 READ( aFont, SvxFontItem , rVersions.nFontVersion) //STRIP001 //STRIP001 if( rStream.GetStreamCharSet() == aFont.GetCharSet() ) @@ -449,7 +449,7 @@ DBG_ASSERT(0, "STRIP");return FALSE; //STRIP001 SfxPoolItem* pNew; /*?*/BOOL SwBoxAutoFmt::LoadOld( SvStream& rStream, USHORT aLoadVer[] ) /*?*/{ -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE; //STRIP001 SfxPoolItem* pNew; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 SfxPoolItem* pNew; //STRIP001 READ( aFont, SvxFontItem , 0) //STRIP001 //STRIP001 if( rStream.GetStreamCharSet() == aFont.GetCharSet() ) @@ -479,7 +479,7 @@ DBG_ASSERT(0, "STRIP");return FALSE; //STRIP001 SfxPoolItem* pNew; /*?*/BOOL SwBoxAutoFmt::Save( SvStream& rStream ) const /*?*/{ -/*?*/DBG_ASSERT(0, "STRIP");return FALSE;//STRIP001 aFont.Store( rStream, aFont.GetVersion(SOFFICE_FILEFORMAT_40) ); +/*?*/DBG_BF_ASSERT(0, "STRIP");return FALSE;//STRIP001 aFont.Store( rStream, aFont.GetVersion(SOFFICE_FILEFORMAT_40) ); //STRIP001 aHeight.Store( rStream, aHeight.GetVersion(SOFFICE_FILEFORMAT_40) ); //STRIP001 aWeight.Store( rStream, aWeight.GetVersion(SOFFICE_FILEFORMAT_40) ); //STRIP001 aPosture.Store( rStream, aPosture.GetVersion(SOFFICE_FILEFORMAT_40) ); @@ -519,7 +519,7 @@ DBG_ASSERT(0, "STRIP");return FALSE; //STRIP001 SfxPoolItem* pNew; /*?*/BOOL SwBoxAutoFmt::SaveVerionNo( SvStream& rStream ) const /*?*/{ -DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 rStream << aFont.GetVersion( SOFFICE_FILEFORMAT_40 ); +DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 rStream << aFont.GetVersion( SOFFICE_FILEFORMAT_40 ); //STRIP001 rStream << aHeight.GetVersion( SOFFICE_FILEFORMAT_40 ); //STRIP001 rStream << aWeight.GetVersion( SOFFICE_FILEFORMAT_40 ); //STRIP001 rStream << aPosture.GetVersion( SOFFICE_FILEFORMAT_40 ); @@ -608,7 +608,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 rStream << aFont.GetVersion( /*N*/void SwTableAutoFmt::SetBoxFmt( const SwBoxAutoFmt& rNew, BYTE nPos ) /*N*/{ -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ASSERT( 0 <= nPos && nPos < 16, "falscher Bereich" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ASSERT( 0 <= nPos && nPos < 16, "falscher Bereich" ); //STRIP001 /*?*/ //STRIP001 /*?*/ SwBoxAutoFmt* pFmt = aBoxAutoFmt[ nPos ]; //STRIP001 /*?*/ if( pFmt ) // ist gesetzt -> kopieren @@ -796,7 +796,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 rStream << aFont.GetVersion( /*?*/BOOL SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions ) /*?*/{ -/*?*/ BOOL bRet = TRUE;DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ BOOL bRet = TRUE;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 USHORT nVal = 0; //STRIP001 rStream >> nVal; //STRIP001 bRet = 0 == rStream.GetError(); @@ -847,7 +847,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 rStream << aFont.GetVersion( /*?*/BOOL SwTableAutoFmt::LoadOld( SvStream& rStream, USHORT aLoadVer[] ) /*?*/{ -/*?*/ BOOL bRet = TRUE; DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ BOOL bRet = TRUE; DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 USHORT nVal = 0; //STRIP001 rStream >> nVal; //STRIP001 bRet = 0 == rStream.GetError(); @@ -882,7 +882,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 rStream << aFont.GetVersion( /*N*/BOOL SwTableAutoFmt::Save( SvStream& rStream ) const /*N*/{ -/*N*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 USHORT nVal = AUTOFORMAT_DATA_ID; +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 USHORT nVal = AUTOFORMAT_DATA_ID; //STRIP001 BOOL b; //STRIP001 rStream << nVal; //STRIP001 rStream.WriteByteString( aName, rStream.GetStreamCharSet() ); @@ -914,7 +914,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 rStream << aFont.GetVersion( /*N*/ SwTableAutoFmtTbl::SwTableAutoFmtTbl() /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 String sNm; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 String sNm; //STRIP001 SwTableAutoFmt* pNew = new SwTableAutoFmt( //STRIP001 SwStyleNameMapper::GetUIName( RES_POOLCOLL_STANDARD, sNm ) ); //STRIP001 @@ -972,7 +972,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 String sNm; /*N*/ BOOL SwTableAutoFmtTbl::Load() /*N*/ { -/*N*/ BOOL bRet = FALSE;DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ BOOL bRet = FALSE;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 String sNm( String::CreateFromAscii( //STRIP001 RTL_CONSTASCII_STRINGPARAM( sAutoTblFmtName ))); //STRIP001 SvtPathOptions aOpt; @@ -988,7 +988,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 String sNm; /*N*/ BOOL SwTableAutoFmtTbl::Save() const /*N*/ { -DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SvtPathOptions aPathOpt; +DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SvtPathOptions aPathOpt; //STRIP001 String sNm( URIHelper::SmartRelToAbs( aPathOpt.GetUserConfigPath() )); //STRIP001 sNm += INET_PATH_TOKEN; //STRIP001 sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( sAutoTblFmtName )); @@ -998,7 +998,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SvtPathOptions aPathOpt; /*N*/ BOOL SwTableAutoFmtTbl::Load( SvStream& rStream ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 BOOL bRet = 0 == rStream.GetError(); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 BOOL bRet = 0 == rStream.GetError(); //STRIP001 if (bRet) //STRIP001 { //STRIP001 // Achtung hier muss ein allgemeiner Header gelesen werden @@ -1093,7 +1093,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 SvtPathOptions aPathOpt; /*N*/ BOOL SwTableAutoFmtTbl::Save( SvStream& rStream ) const /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 BOOL bRet = 0 == rStream.GetError(); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 BOOL bRet = 0 == rStream.GetError(); //STRIP001 if (bRet) //STRIP001 { //STRIP001 rStream.SetVersion( SOFFICE_FILEFORMAT_40 ); diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx index bef88f836..5ffaa99cb 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ndcopy.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:58 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -399,7 +399,7 @@ namespace binfilter { /*N*/ { /*?*/ // es wird eine DDE-Tabelle kopiert /*?*/ // ist im neuen Dokument ueberhaupt der FeldTyp vorhanden ? -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDDEType = ((SwDDETable&)GetTable()).GetDDEFldType(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDDEType = ((SwDDETable&)GetTable()).GetDDEFldType(); //STRIP001 /*?*/ if( pDDEType->IsDeleted() ) //STRIP001 /*?*/ pDoc->InsDeletedFldType( *pDDEType ); //STRIP001 /*?*/ else @@ -670,7 +670,7 @@ namespace binfilter { /*N*/ // verhinder das Kopieren in Fly's, die im Bereich verankert sind. /*N*/ if( pDoc == this ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // Start-/EndNode noch korrigieren +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // Start-/EndNode noch korrigieren //STRIP001 /*?*/ ULONG nStt = pStt->nNode.GetIndex(), //STRIP001 /*?*/ nEnd = pEnd->nNode.GetIndex(), //STRIP001 /*?*/ nDiff = nEnd - nStt +1; @@ -695,17 +695,17 @@ namespace binfilter { /*N*/ BOOL bRet = FALSE; /*N*/ /*N*/ if( pDoc && pDoc != this ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 bRet = _Copy( rPam, rPos, TRUE, pRedlineRange ); // nur normales Kopieren +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 bRet = _Copy( rPam, rPos, TRUE, pRedlineRange ); // nur normales Kopieren /*N*/ // Copy in sich selbst (ueber mehrere Nodes wird hier gesondert /*N*/ // behandelt; in einem TextNode wird normal behandelt) /*N*/ else if( ! ( *pStt <= rPos && rPos < *pEnd && /*N*/ ( pStt->nNode != pEnd->nNode || /*N*/ !pStt->nNode.GetNode().IsTxtNode() )) ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 bRet = _Copy( rPam, rPos, TRUE, pRedlineRange ); // nur normales Kopieren +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 bRet = _Copy( rPam, rPos, TRUE, pRedlineRange ); // nur normales Kopieren /*N*/ /*N*/ else /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ASSERT( this == pDoc, " falscher Copy-Zweig!" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ASSERT( this == pDoc, " falscher Copy-Zweig!" ); //STRIP001 /*?*/ pDoc->SetRedlineMode_intern( eOld | REDLINE_IGNORE ); //STRIP001 /*?*/ //STRIP001 /*?*/ BOOL bDoUndo = pDoc->DoesUndo(); @@ -765,7 +765,7 @@ namespace binfilter { /*N*/ pDoc->SetRedlineMode_intern( eOld ); /*N*/ if( pRedlineRange ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pDoc->IsRedlineOn() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pDoc->IsRedlineOn() ) //STRIP001 /*?*/ pDoc->AppendRedline( new SwRedline( REDLINE_INSERT, *pRedlineRange )); //STRIP001 /*?*/ else //STRIP001 /*?*/ pDoc->SplitRedline( *pRedlineRange ); @@ -1171,14 +1171,14 @@ namespace binfilter { /*N*/ // dann kopiere noch alle Bookmarks /*N*/ if( GetBookmarks().Count() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwPaM aRgTmp( rRg.aStart, rRg.aEnd ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aRgTmp( rRg.aStart, rRg.aEnd ); //STRIP001 /*?*/ SwPaM aCpyTmp( aCpyRange.aStart, aCpyRange.aEnd ); //STRIP001 /*?*/ //STRIP001 /*?*/ lcl_CopyBookmarks( aRgTmp, aCpyTmp ); /*N*/ } /*N*/ /*N*/ if( bDelRedlines && ( REDLINE_DELETE_REDLINES & pDest->GetRedlineMode() )) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 lcl_DeleteRedlines( rRg, aCpyRange ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 lcl_DeleteRedlines( rRg, aCpyRange ); /*N*/ /*N*/ pDest->GetNodes()._DelDummyNodes( aCpyRange ); /*N*/ } @@ -1290,7 +1290,7 @@ namespace binfilter { /*N*/ nCnt += rChain.GetNext() ? 1: 0; /*N*/ for ( USHORT k = 0; nCnt && k < aArr.Count(); ++k ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const _ZSortFly &rTmp = aArr[k]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const _ZSortFly &rTmp = aArr[k]; //STRIP001 /*?*/ const SwFrmFmt *pTmp = rTmp.GetFmt(); //STRIP001 /*?*/ if ( rChain.GetPrev() == pTmp ) //STRIP001 /*?*/ { diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx index e5a7036d0..3e84c4613 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ndnotxt.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:50 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -179,7 +179,7 @@ namespace binfilter { /*N*/ { /*N*/ if( !bContourMapModeValid ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const MapMode aGrfMap( GetGraphic().GetPrefMapMode() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const MapMode aGrfMap( GetGraphic().GetPrefMapMode() ); //STRIP001 /*?*/ BOOL bPixelGrf = aGrfMap.GetMapUnit() == MAP_PIXEL; //STRIP001 /*?*/ const MapMode aContourMap( bPixelGrf ? MAP_PIXEL : MAP_100TH_MM ); //STRIP001 /*?*/ if( bPixelGrf ? !bPixelContour : aGrfMap != aContourMap ) @@ -240,7 +240,7 @@ namespace binfilter { /*?*/ rContour = *pContour; /*?*/ if( bContourMapModeValid ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const MapMode aGrfMap( GetGraphic().GetPrefMapMode() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const MapMode aGrfMap( GetGraphic().GetPrefMapMode() ); //STRIP001 /*?*/ const MapMode aContourMap( MAP_100TH_MM ); //STRIP001 /*?*/ ASSERT( aGrfMap.GetMapUnit() != MAP_PIXEL || //STRIP001 /*?*/ aGrfMap == MapMode( MAP_PIXEL ), diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx index 62ba53cef..935df8ba9 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ndsect.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-05-04 14:32:50 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -216,7 +216,7 @@ namespace binfilter { /*N*/ // koennen wir zur Zeit nicht !!!! /*N*/ if( rNew.IsHidden() && rRange.HasMark() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwPosition *pStt = rRange.Start(), *pEnd = rRange.End(); //STRIP001 /*?*/ if( !pStt->nContent.GetIndex() && //STRIP001 /*?*/ pEnd->nNode.GetNode().GetCntntNode()->Len() == //STRIP001 /*?*/ pEnd->nContent.GetIndex() ) @@ -349,7 +349,7 @@ namespace binfilter { /*N*/ /*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( *pNewSectNode->EndOfSectionNode(), *pNewSectNode, 1 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( *pNewSectNode->EndOfSectionNode(), *pNewSectNode, 1 ); //STRIP001 /*?*/ if( IsRedlineOn() ) //STRIP001 /*?*/ AppendRedline( new SwRedline( REDLINE_INSERT, aPam )); //STRIP001 /*?*/ else @@ -360,7 +360,7 @@ namespace binfilter { /*N*/ if( rNew.IsHidden() && rNew.GetCondition().Len() ) /*N*/ { /*?*/ // dann berechne bis zu dieser Position -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwCalc aCalc( *this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwCalc aCalc( *this ); //STRIP001 /*?*/ if( ! IsInReading() ) //STRIP001 /*?*/ FldsToCalc( aCalc, pNewSectNode->GetIndex() ); //STRIP001 /*?*/ SwSection& rNewSect = pNewSectNode->GetSection(); @@ -546,7 +546,7 @@ namespace binfilter { /*N*/ /*N*/ if( DoesUndo() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); //STRIP001 /*?*/ if( bDelNodes && pIdx && &GetNodes() == &pIdx->GetNodes() && //STRIP001 /*?*/ 0 != (pSectNd = pIdx->GetNode().GetSectionNode() )) //STRIP001 /*?*/ { @@ -663,7 +663,7 @@ namespace binfilter { /*N*/ if( rSect.IsHidden() && 0 != (pIdx = pFmt->GetCntnt().GetCntntIdx() ) /*N*/ && 0 != (pSectNd = pIdx->GetNode().GetSectionNode() ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ::lcl_CheckEmptyLayFrm( GetNodes(), (SwSection&)rSect, +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ::lcl_CheckEmptyLayFrm( GetNodes(), (SwSection&)rSect, //STRIP001 /*?*/ *pSectNd, *pSectNd->EndOfSectionNode() ); /*N*/ } /*N*/ } @@ -709,7 +709,7 @@ namespace binfilter { /*N*/ if( pSection->IsHidden() && pSection->GetCondition().Len() ) /*N*/ { /*?*/ // dann berechne bis zu dieser Position -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwCalc aCalc( *this ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwCalc aCalc( *this ); //STRIP001 /*?*/ if( !pIdx ) //STRIP001 /*?*/ pIdx = pFmt->GetCntnt().GetCntntIdx(); //STRIP001 /*?*/ FldsToCalc( aCalc, pIdx->GetIndex() ); @@ -772,7 +772,7 @@ namespace binfilter { /*N*/ SwFtnIdxs& rFtnArr = pNd->GetDoc()->GetFtnIdxs(); /*N*/ if( rFtnArr.Count() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nPos; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nPos; //STRIP001 /*?*/ rFtnArr.SeekEntry( SwNodeIndex( *pNd ), &nPos ); //STRIP001 /*?*/ SwTxtFtn* pSrch; //STRIP001 /*?*/ diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx index 966f67c28..f6d18bcc0 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ndtbl.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-05-04 14:34:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -651,7 +651,7 @@ static bool lcl_IsItemSet(const SwFmt & rFmt, USHORT which) /*N*/ SwTableBoxFmt *pBoxF; /*N*/ if( pTAFmt ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BYTE nId = !n ? 0 : (( n+1 == nRows ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BYTE nId = !n ? 0 : (( n+1 == nRows ) //STRIP001 /*?*/ ? 12 : (4 * (1 + ((n-1) & 1 )))); //STRIP001 /*?*/ nId += !i ? 0 : ( i+1 == nCols ? 3 : (1 + ((i-1) & 1))); //STRIP001 /*?*/ pBoxF = ::lcl_CreateAFmtBoxFmt( *this, aBoxFmtArr, *pTAFmt, @@ -705,7 +705,7 @@ static bool lcl_IsItemSet(const SwFmt & rFmt, USHORT which) /*N*/ /*N*/ if( IsRedlineOn() || (!IsIgnoreRedline() && pRedlineTbl->Count() )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( *pTblNd->EndOfSectionNode(), *pTblNd, 1 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwPaM aPam( *pTblNd->EndOfSectionNode(), *pTblNd, 1 ); //STRIP001 /*?*/ if( IsRedlineOn() ) //STRIP001 /*?*/ AppendRedline( new SwRedline( REDLINE_INSERT, aPam )); //STRIP001 /*?*/ else @@ -1913,7 +1913,7 @@ static bool lcl_IsItemSet(const SwFmt & rFmt, USHORT which) /*N*/ BOOL SwDoc::SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert, USHORT nCnt, /*N*/ sal_Bool bSameHeight ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 // uebers SwDoc fuer Undo !! //STRIP001 ASSERT( rBoxes.Count() && nCnt, "keine gueltige Box-Liste" ); //STRIP001 SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode(); @@ -2178,7 +2178,7 @@ static bool lcl_IsItemSet(const SwFmt & rFmt, USHORT which) /*N*/ if ( !pFrm->IsFollow() ) /*N*/ { /*N*/ while ( pFrm->HasFollow() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pFrm->JoinAndDelFollows(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pFrm->JoinAndDelFollows(); /*N*/ pFrm->Cut(); /*N*/ delete pFrm; /*N*/ bAgain = TRUE; @@ -2191,7 +2191,7 @@ static bool lcl_IsItemSet(const SwFmt & rFmt, USHORT which) /*N*/ void SwTableNode::SetNewTable( SwTable* pNewTable, BOOL bNewFrames ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DelFrms(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DelFrms(); //STRIP001 delete pTable; //STRIP001 pTable = pNewTable; //STRIP001 if( bNewFrames ) @@ -3572,7 +3572,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 DelFrms(); /*N*/ { /*?*/ if( DoesUndo() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ClearRedo(); //STRIP001 /*?*/ AppendUndo( new SwUndoTblNumFmt( *pBox ) ); /*?*/ } /*?*/ diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx index 564ec872f..d5bae2706 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ndtbl1.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:19 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -314,7 +314,7 @@ extern void ClearFEShellTabCols(); /*N*/ { /*N*/ if ( k != i && 1) //STRIP001 ::lcl_IsAnLower( pUpLine, (SwTableLine*)rArr[k] ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rArr.Remove( k ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rArr.Remove( k ); //STRIP001 /*?*/ if ( k <= i ) //STRIP001 /*?*/ --i; //STRIP001 /*?*/ --k; @@ -428,7 +428,7 @@ extern void ClearFEShellTabCols(); /*N*/ /*N*/ if( 1 < aRowArr.Count() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( !bTstOnly ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( !bTstOnly ) //STRIP001 /*?*/ { //STRIP001 /*?*/ long nHeight = 0; //STRIP001 /*?*/ for ( USHORT i = 0; i < aRowArr.Count(); ++i ) diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx b/binfilter/bf_sw/source/core/docnode/sw_node.cxx index 2b9010c68..52fc275c5 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_node.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:20 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1036,7 +1036,7 @@ using namespace ::com::sun::star::i18n; /*N*/ break; /*N*/ //FEATURE::CONDCOLL /*N*/ case RES_CONDCOLL_CONDCHG: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( ((SwCondCollCondChg*)pNewValue)->pChangedFmt == GetRegisteredIn() && +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( ((SwCondCollCondChg*)pNewValue)->pChangedFmt == GetRegisteredIn() && //STRIP001 /*?*/ &GetNodes() == &GetDoc()->GetNodes() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ ChkCondColl(); @@ -1403,7 +1403,7 @@ using namespace ::com::sun::star::i18n; /*?*/ return TRUE; /*?*/ /*?*/ case RES_GETLOWERNUMLEVEL: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( IsTxtNode() && ((SwTxtNode*)this)->GetNum() && +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( IsTxtNode() && ((SwTxtNode*)this)->GetNum() && //STRIP001 /*?*/ 0 != ( pItem = (SwNumRuleItem*)GetNoCondAttr( //STRIP001 /*?*/ RES_PARATR_NUMRULE, TRUE )) && pItem->GetValue().Len() && //STRIP001 /*?*/ pItem->GetValue() == ((SwNRuleLowerLevel&)rInfo).GetName() && @@ -1415,7 +1415,7 @@ using namespace ::com::sun::star::i18n; /*?*/ break; /*?*/ /*?*/ case RES_FINDNEARESTNODE: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( ((SwFmtPageDesc&)GetAttr( RES_PAGEDESC )).GetPageDesc() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( ((SwFmtPageDesc&)GetAttr( RES_PAGEDESC )).GetPageDesc() ) //STRIP001 /*?*/ ((SwFindNearestNode&)rInfo).CheckNode( *this ); /*?*/ return TRUE; /*?*/ diff --git a/binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx b/binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx index 6e18b43ae..35d561644 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_node2lay.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,7 +133,7 @@ namespace binfilter { /*N*/ // damit wir uns vor/hinter ihn haengen koennen /*N*/ if( !bSearch && rNode.GetIndex() < nIndex ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwNodeIndex aTmp( *rNode.EndOfSectionNode(), +1 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwNodeIndex aTmp( *rNode.EndOfSectionNode(), +1 ); //STRIP001 /*?*/ pNd = rNode.GetNodes().GoPreviousWithFrm( &aTmp ); //STRIP001 /*?*/ if( !bSearch && pNd && rNode.GetIndex() > pNd->GetIndex() ) //STRIP001 /*?*/ pNd = NULL; // Nicht ueber den Bereich hinausschiessen diff --git a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx index 850c76d4d..4c9f8962b 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_nodes.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_nodes.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -258,7 +258,7 @@ namespace binfilter { /*?*/ /*?*/ for( ULONG n = rDelPos.GetIndex(); nSize; n += nDiff, --nSize ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwNodeIndex aDelIdx( *this, n ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwNodeIndex aDelIdx( *this, n ); //STRIP001 /*?*/ SwNode& rNd = aDelIdx.GetNode(); //STRIP001 /*?*/ if( rNd.IsTxtNode() && NO_NUMBERING != //STRIP001 /*?*/ ((SwTxtNode&)rNd).GetTxtColl()->GetOutlineLevel() ) @@ -307,7 +307,7 @@ namespace binfilter { /*N*/ if( pNd->IsNoTxtNode() ) /*N*/ { /*?*/ if( bSavePersData ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ((SwNoTxtNode*)pNd)->SavePersistentData(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ((SwNoTxtNode*)pNd)->SavePersistentData(); /*N*/ } /*N*/ else if( pNd->IsTxtNode() ) /*N*/ { @@ -413,7 +413,7 @@ namespace binfilter { /*?*/ // in unterschiedliche Docs gemoved ? /*?*/ // dann die Daten wieder persistent machen /*?*/ if( pCNd->IsNoTxtNode() && bRestPersData ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ((SwNoTxtNode*)pCNd)->RestorePersistentData(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ((SwNoTxtNode*)pCNd)->RestorePersistentData(); /*N*/ } /*N*/ } /*N*/ } @@ -453,7 +453,7 @@ namespace binfilter { /*?*/ if( pFrmNd ) /*?*/ while( aIdx != rInsPos ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode(); //STRIP001 /*?*/ if( pCNd ) //STRIP001 /*?*/ { //STRIP001 /*?*/ if( pFrmNd->IsTableNode() ) @@ -593,7 +593,7 @@ namespace binfilter { /*?*/ pTblNd->pStartOfSection = aIdx.GetNode().pStartOfSection; /*?*/ for( ULONG n = 0; n < nInsPos; ++n ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwNodeIndex aMvIdx( aRg.aEnd, 1 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwNodeIndex aMvIdx( aRg.aEnd, 1 ); //STRIP001 /*?*/ SwCntntNode* pCNd = 0; //STRIP001 /*?*/ SwNode* pTmpNd = &aMvIdx.GetNode(); //STRIP001 /*?*/ if( pTmpNd->IsCntntNode() ) @@ -663,14 +663,14 @@ namespace binfilter { /*?*/ { /*?*/ pSttNode->pEndOfSection = (SwEndNode*)pNd; /*?*/ if( pSttNode->IsSectionNode() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ((SwSectionNode*)pSttNode)->NodesArrChgd(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ((SwSectionNode*)pSttNode)->NodesArrChgd(); /*?*/ pSttNode = pSttNode->pStartOfSection; /*?*/ } /*?*/ } /*?*/ /*?*/ if( pTblNd->GetTable().IsA( TYPE( SwDDETable ) )) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwDDEFieldType* pTyp = ((SwDDETable&)pTblNd-> +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwDDEFieldType* pTyp = ((SwDDETable&)pTblNd-> //STRIP001 /*?*/ GetTable()).GetDDEFldType(); //STRIP001 /*?*/ if( pTyp ) //STRIP001 /*?*/ { @@ -773,7 +773,7 @@ namespace binfilter { /*?*/ // SectionNode muss noch ein paar Indizies ummelden /*?*/ if( pSctNd ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pSctNd->NodesArrChgd(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pSctNd->NodesArrChgd(); //STRIP001 /*?*/ ++nSectNdCnt; //STRIP001 /*?*/ bNewFrms = FALSE; /*?*/ } @@ -982,7 +982,7 @@ namespace binfilter { /*N*/ /*N*/ #ifdef JP_DEBUG /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ extern Writer* GetDebugWriter(const String&); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ extern Writer* GetDebugWriter(const String&); //STRIP001 /*?*/ //STRIP001 /*?*/ Writer* pWriter = GetDebugWriter(aEmptyStr); //STRIP001 /*?*/ if( pWriter ) @@ -1486,7 +1486,7 @@ namespace binfilter { //STRIP001 } /*N*/ void SwNodes::GoStartOfSection(SwNodeIndex *pIdx) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // hinter den naechsten Startnode //STRIP001 SwNodeIndex aTmp( *pIdx->GetNode().StartOfSectionNode(), +1 ); //STRIP001 @@ -2142,7 +2142,7 @@ namespace binfilter { /*?*/ if( pAktNode->EndOfSectionIndex() < aRg.aEnd.GetIndex() ) /*?*/ { /*?*/ // also der gesamte, lege einen neuen SectionNode an -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwNodeIndex nStt( aInsPos, -1 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwNodeIndex nStt( aInsPos, -1 ); //STRIP001 /*?*/ SwSectionNode* pSectNd = ((SwSectionNode*)pAktNode)-> //STRIP001 /*?*/ MakeCopy( pDoc, aInsPos ); //STRIP001 /*?*/ diff --git a/binfilter/bf_sw/source/core/docnode/sw_section.cxx b/binfilter/bf_sw/source/core/docnode/sw_section.cxx index 4858a9440..ae975a573 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_section.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_section.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_section.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -373,7 +373,7 @@ namespace binfilter { /*N*/ if( bHidden == bFlag ) /*N*/ return; /*N*/ -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bHidden = bFlag; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bHidden = bFlag; //STRIP001 /*?*/ _SetHiddenFlag( bHidden, bCondHiddenFlag ); /*N*/ } @@ -469,7 +469,7 @@ namespace binfilter { /*N*/ /*N*/ if( bRemake ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 GetFmt()->DelFrms(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 GetFmt()->DelFrms(); //STRIP001 /*?*/ GetFmt()->MakeFrms(); /*N*/ } /*N*/ @@ -599,11 +599,11 @@ namespace binfilter { /*N*/ if( pIdx && &GetDoc()->GetNodes() == &pIdx->GetNodes() && /*N*/ 0 != (pSectNd = pIdx->GetNode().GetSectionNode() )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwSection& rSect = pSectNd->GetSection(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwSection& rSect = pSectNd->GetSection(); //STRIP001 /*?*/ // falls es ein gelinkter Bereich war, dann muessen alle //STRIP001 /*?*/ // Child-Verknuepfungen sichtbar bemacht werden. //STRIP001 /*?*/ if( rSect.IsConnected() ) -//STRIP001 /*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 rSect.MakeChildLinksVisible( *pSectNd ); +//STRIP001 /*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 rSect.MakeChildLinksVisible( *pSectNd ); //STRIP001 /*?*/ //STRIP001 /*?*/ // vorm loeschen der Nodes pruefe, ob wir uns nicht //STRIP001 /*?*/ // noch anzeigen muessen! @@ -807,7 +807,7 @@ namespace binfilter { /*?*/ { /*?*/ // mein Parent wird vernichtet, dann an den Parent vom Parent /*?*/ // umhaengen und wieder aktualisieren -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFrmFmt::Modify( pOld, pNew ); // erst umhaengen !!! +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFrmFmt::Modify( pOld, pNew ); // erst umhaengen !!! //STRIP001 /*?*/ UpdateParent(); //STRIP001 /*?*/ return; /*?*/ } @@ -819,7 +819,7 @@ namespace binfilter { /*N*/ ((SwFmtChg*)pNew)->pChangedFmt->IsA( TYPE( SwSectionFmt )) ) /*N*/ { /*?*/ // mein Parent wird veraendert, muss mich aktualisieren -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFrmFmt::Modify( pOld, pNew ); // erst umhaengen !!! +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFrmFmt::Modify( pOld, pNew ); // erst umhaengen !!! //STRIP001 /*?*/ UpdateParent(); //STRIP001 /*?*/ return; /*N*/ } @@ -928,7 +928,7 @@ namespace binfilter { /*N*/ /*N*/ // noch eine Sortierung erwuenscht ? /*N*/ if( 1 < rArr.Count() ) -/*N*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 switch( eSort ) +/*N*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 switch( eSort ) //STRIP001 /*?*/ { //STRIP001 /*?*/ case SORTSECT_NAME: //STRIP001 /*?*/ qsort( (void*)rArr.GetData(), @@ -1067,7 +1067,7 @@ namespace binfilter { /*N*/ { /*?*/ // liegt in dem Bereich: also updaten. Aber nur wenns nicht /*?*/ // im gleichen File liegt -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 String sFName; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 String sFName; //STRIP001 /*?*/ pDoc->GetLinkManager().GetDisplayNames( pBLink, 0, &sFName, 0, 0 ); //STRIP001 /*?*/ if( sFName != sName ) //STRIP001 /*?*/ { @@ -1394,7 +1394,7 @@ namespace binfilter { /*N*/ ::com::sun::star::uno::Sequence< sal_Int8 > aSeq; /*N*/ if( pRead && rValue.hasValue() && ( rValue >>= aSeq ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pESh ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pESh ) //STRIP001 /*?*/ { //STRIP001 /*?*/ pESh->Push(); //STRIP001 /*?*/ SwPaM* pCrsr = pESh->GetCrsr(); diff --git a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx index 83de156bf..ac88a1261 100644 --- a/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx +++ b/binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swbaslnk.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -221,7 +221,7 @@ namespace binfilter { /*?*/ SwFrmFmt* pFmt; /*?*/ if( nEvent && 0 != ( pFmt = pCntntNode->GetFlyFmt() )) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwCallMouseEvent aCallEvent; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwCallMouseEvent aCallEvent; //STRIP001 /*?*/ aCallEvent.Set( EVENT_OBJECT_IMAGE, pFmt ); //STRIP001 /*?*/ pDoc->CallEvent( nEvent, aCallEvent ); /*?*/ } @@ -464,7 +464,7 @@ namespace binfilter { /*?*/ pTblNd->GetTable().GetHTMLTableLayout(); /*?*/ if( pLayout ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nBrowseWidth = +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nBrowseWidth = //STRIP001 /*?*/ pLayout->GetBrowseWidthByTable( *pDoc ); //STRIP001 /*?*/ if( nBrowseWidth ) //STRIP001 /*?*/ pLayout->Resize( nBrowseWidth, TRUE, TRUE, diff --git a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx index da5ef7860..ef9e0809c 100644 --- a/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx +++ b/binfilter/bf_sw/source/core/draw/sw_dcontact.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_dcontact.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:24 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1363,7 +1363,7 @@ const Point SwDrawVirtObj::GetOffset() const void SwDrawVirtObj::operator=( const SdrObject& rObj ) { -DBG_ASSERT(0, "STRIP");//STRIP001 +DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 SdrVirtObj::operator=(rObj); //STRIP001 //STRIP001 // copy local offset @@ -1548,7 +1548,7 @@ void SwDrawVirtObj::TakeContour(XPolyPolygon& rPoly) const } SdrHdl* SwDrawVirtObj::GetHdl(USHORT nHdlNum) const -{DBG_ASSERT(0, "STRIP");return NULL;//STRIP001 +{DBG_BF_ASSERT(0, "STRIP");return NULL;//STRIP001 //STRIP001 SdrHdl* pHdl = rRefObj.GetHdl(nHdlNum); //STRIP001 Point aP(pHdl->GetPos() + maOffset); //STRIP001 pHdl->SetPos(aP); @@ -1557,7 +1557,7 @@ SdrHdl* SwDrawVirtObj::GetHdl(USHORT nHdlNum) const } SdrHdl* SwDrawVirtObj::GetPlusHdl(const SdrHdl& rHdl, USHORT nPlNum) const -{DBG_ASSERT(0, "STRIP");return NULL;//STRIP001 +{DBG_BF_ASSERT(0, "STRIP");return NULL;//STRIP001 //STRIP001 SdrHdl* pHdl = rRefObj.GetPlusHdl(rHdl, nPlNum); //STRIP001 pHdl->SetPos(pHdl->GetPos() + maOffset); //STRIP001 @@ -1625,7 +1625,7 @@ void SwDrawVirtObj::Rotate(const Point& rRef, long nWink, double sn, double cs) } void SwDrawVirtObj::Mirror(const Point& rRef1, const Point& rRef2) -{DBG_ASSERT(0, "STRIP");//STRIP001 +{DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 Rectangle aBoundRect0; if(pUserCall) aBoundRect0 = GetBoundRect(); //STRIP001 rRefObj.Mirror(rRef1 - maOffset, rRef2 - maOffset); //STRIP001 SetRectsDirty(); @@ -1702,7 +1702,7 @@ void SwDrawVirtObj::NbcSetLogicRect(const Rectangle& rRect) } Point SwDrawVirtObj::GetSnapPoint(USHORT i) const -{DBG_ASSERT(0, "STRIP");Point ap; return ap;//STRIP001 +{DBG_BF_ASSERT(0, "STRIP");Point ap; return ap;//STRIP001 //STRIP001 Point aP(rRefObj.GetSnapPoint(i)); //STRIP001 aP += maOffset; //STRIP001 diff --git a/binfilter/bf_sw/source/core/draw/sw_dpage.cxx b/binfilter/bf_sw/source/core/draw/sw_dpage.cxx index b79ac18cf..8279ae9be 100644 --- a/binfilter/bf_sw/source/core/draw/sw_dpage.cxx +++ b/binfilter/bf_sw/source/core/draw/sw_dpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_dpage.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:24 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -189,7 +189,7 @@ using namespace ::com::sun::star::frame; /*N*/ SdrObjUserCall* pContact; /*N*/ if ( 0 != ( pContact = GetUserCall(pOld) ) && /*N*/ RES_DRAWFRMFMT == ((SwContact*)pContact)->GetFmt()->Which()) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwDrawContact*)pContact)->ChangeMasterObject( pNewObj ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwDrawContact*)pContact)->ChangeMasterObject( pNewObj ); /*N*/ return FmFormPage::ReplaceObject( pNewObj, nObjNum ); /*N*/ } diff --git a/binfilter/bf_sw/source/core/draw/sw_dview.cxx b/binfilter/bf_sw/source/core/draw/sw_dview.cxx index b9207221a..f5cb7be33 100644 --- a/binfilter/bf_sw/source/core/draw/sw_dview.cxx +++ b/binfilter/bf_sw/source/core/draw/sw_dview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_dview.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -202,7 +202,7 @@ public: /*?*/ /*?*/ if(FLY_IN_CNTNT == rAnchor.GetAnchorId()) /*?*/ return; -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const SwFrm* pAnch; //STRIP001 /*?*/ if(0 == (pAnch = CalcAnchor())) //STRIP001 /*?*/ return; @@ -689,7 +689,7 @@ public: /*N*/ sal_Bool bColorWasSaved(sal_False); /*N*/ /*N*/ if(pView) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ aBackColor = pView->GetBackgroundColor(); //STRIP001 /*?*/ bColorWasSaved = sal_True; /*N*/ } @@ -698,7 +698,7 @@ public: /*N*/ FmFormView::ModelHasChanged(); /*N*/ /*N*/ if(bColorWasSaved) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pView = GetTextEditOutlinerView(); //STRIP001 /*?*/ //STRIP001 /*?*/ if(pView) diff --git a/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx b/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx index fbb7c4ec2..cc54eadb2 100644 --- a/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx +++ b/binfilter/bf_sw/source/core/edit/sw_ednumber.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ednumber.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:29 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -603,7 +603,7 @@ namespace binfilter { /*?*/ /*?*/ if( !*pHasChilds ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwNRuleLowerLevel aHnt( rRule, nLvl ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwNRuleLowerLevel aHnt( rRule, nLvl ); //STRIP001 /*?*/ for( i = 0; i < nMaxItems; ++i ) //STRIP001 /*?*/ if( 0 != (pItem = GetDoc()->GetAttrPool().GetItem( RES_PARATR_NUMRULE, i ) ) && //STRIP001 /*?*/ 0 != ( pMod = (SwModify*)((SwNumRuleItem*)pItem)->GetDefinedIn()) && diff --git a/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx b/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx index 39e833efc..8a26223eb 100644 --- a/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_cellfml.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:34 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -191,7 +191,7 @@ const USHORT cMAXSTACKSIZE = 50; /*?*/ if( !((SwTblBoxFormula*)pItem)->IsValid() ) /*?*/ { /*?*/ // dann berechnen -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwTable* pTmp = rCalcPara.pTbl; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwTable* pTmp = rCalcPara.pTbl; //STRIP001 /*?*/ rCalcPara.pTbl = &pBox->GetSttNd()->FindTableNode()->GetTable(); //STRIP001 /*?*/ ((SwTblBoxFormula*)pItem)->Calc( rCalcPara, nRet ); //STRIP001 /*?*/ @@ -613,7 +613,7 @@ const USHORT cMAXSTACKSIZE = 50; /*N*/ case REL_NAME: /*?*/ if( pTbl ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 fnFormel = &SwTableFormula::RelNmsToBoxNms; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 fnFormel = &SwTableFormula::RelNmsToBoxNms; //STRIP001 /*?*/ pNd = GetNodeOfFormula(); /*?*/ } /*?*/ break; @@ -638,7 +638,7 @@ const USHORT cMAXSTACKSIZE = 50; /*?*/ case REL_NAME: /*?*/ if( pTbl ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 fnFormel = &SwTableFormula::RelBoxNmsToPtr; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 fnFormel = &SwTableFormula::RelBoxNmsToPtr; //STRIP001 /*?*/ pNd = GetNodeOfFormula(); /*?*/ } /*?*/ break; @@ -731,7 +731,7 @@ const USHORT cMAXSTACKSIZE = 50; /*?*/ if( sTblNm != rTbl.GetFrmFmt()->GetName() ) /*?*/ { /*?*/ // dann suchen wir uns mal unsere Tabelle: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwTable* pFnd = FindTable( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwTable* pFnd = FindTable( //STRIP001 /*?*/ *rTbl.GetFrmFmt()->GetDoc(), //STRIP001 /*?*/ sTblNm ); //STRIP001 /*?*/ if( pFnd ) diff --git a/binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx b/binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx index 284559a5e..6ec1119ee 100644 --- a/binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ddetbl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:35 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -200,7 +200,7 @@ namespace binfilter { /*N*/ SwDDEFieldType* SwDDETable::GetDDEFldType() /*N*/ { -DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 return (SwDDEFieldType*)aDepend.GetRegisteredIn(); +DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 return (SwDDEFieldType*)aDepend.GetRegisteredIn(); /*N*/ } //STRIP001 BOOL SwDDETable::NoDDETable() diff --git a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx index 66dcb7983..926030cec 100644 --- a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docufld.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-23 14:05:50 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1196,7 +1196,7 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE nMId ) /*N*/ { /*N*/ if ( bName ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 String aStr(SwFieldType::GetTypeStr(GetTypeId())); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 String aStr(SwFieldType::GetTypeStr(GetTypeId())); //STRIP001 /*?*/ aStr += ':'; //STRIP001 /*?*/ //STRIP001 /*?*/ sal_uInt16 nSub = nSubType & 0xff; @@ -1481,7 +1481,7 @@ BOOL SwDocInfoField::PutValue( const uno::Any& rAny, BYTE nMId ) /*N*/ } /*N*/ else if(sTmpName.Search('\"') == STRING_NOTFOUND && /*N*/ sTmpName.GetTokenCount('.') > 2) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ::ReplacePoint(sTmpName); //STRIP001 /*?*/ if(sTmpName.GetChar(0) == '[' && sTmpName.GetChar(sTmpName.Len()-1) == ']') //STRIP001 /*?*/ { // Eckige Klammern entfernen @@ -2202,7 +2202,7 @@ BOOL SwRefPageSetField::PutValue( const uno::Any& rAny, BYTE nMId ) /*N*/ if( !pNew && !pOld && GetDepends() ) /*N*/ { /*?*/ // sammel erstmal alle SetPageRefFelder ein. -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 _SetGetExpFlds aTmpLst( 10, 5 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 _SetGetExpFlds aTmpLst( 10, 5 ); //STRIP001 /*?*/ if( MakeSetList( aTmpLst ) ) //STRIP001 /*?*/ { //STRIP001 /*?*/ SwClientIter aIter( *this ); diff --git a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx index 5b0c21113..c51c4c076 100644 --- a/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_fldbas.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:18 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -423,7 +423,7 @@ using namespace ::com::sun::star; /*N*/ String sRet; /*N*/ if( bName ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nTypeId = GetTypeId(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nTypeId = GetTypeId(); //STRIP001 /*?*/ if( RES_DATETIMEFLD == GetTyp()->Which() ) //STRIP001 /*?*/ nTypeId = GetSubType() & DATEFLD ? TYP_DATEFLD : TYP_TIMEFLD; //STRIP001 /*?*/ diff --git a/binfilter/bf_sw/source/core/fields/sw_flddat.cxx b/binfilter/bf_sw/source/core/fields/sw_flddat.cxx index b665765e6..331a8855d 100644 --- a/binfilter/bf_sw/source/core/fields/sw_flddat.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_flddat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_flddat.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-25 09:53:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ using namespace ::com::sun::star; /*N*/ SwFieldType* SwDateTimeFieldType::Copy() const /*N*/ { -DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 SwDateTimeFieldType *pTmp = new SwDateTimeFieldType(GetDoc()); +DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 SwDateTimeFieldType *pTmp = new SwDateTimeFieldType(GetDoc()); //STRIP001 return pTmp; /*N*/ } diff --git a/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx b/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx index a894b0bc1..a7ad4cbd9 100644 --- a/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_macrofld.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:18 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ using namespace ::rtl; /*N*/ SwFieldType* SwMacroFieldType::Copy() const /*N*/ { -DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 SwMacroFieldType* pType = new SwMacroFieldType(pDoc); +DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 SwMacroFieldType* pType = new SwMacroFieldType(pDoc); //STRIP001 return pType; /*N*/ } diff --git a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx index 4748f4f3c..d05bc0546 100644 --- a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_reffld.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:18 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -692,7 +692,7 @@ String SwGetRefField::GetPar2() const /*N*/ break; /*N*/ case FIELD_PROP_PAR1: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 OUString sTmp; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 OUString sTmp; //STRIP001 /*?*/ rAny >>= sTmp; //STRIP001 /*?*/ SetPar1(sTmp); //STRIP001 /*?*/ ConvertProgrammaticToUIName(); @@ -744,7 +744,7 @@ String SwGetRefField::GetPar2() const /*?*/ break; /*N*/ } /*N*/ if( nResId != USHRT_MAX ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 SetPar1(SW_RESSTR( nResId )); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SetPar1(SW_RESSTR( nResId )); /*N*/ } /*N*/ } /*N*/ } @@ -760,7 +760,7 @@ String SwGetRefField::GetPar2() const /*N*/ SwFieldType* SwGetRefFieldType::Copy() const /*N*/ { -DBG_ASSERT(0, "STRIP");return NULL; //STRIP001 //STRIP001 return new SwGetRefFieldType( pDoc ); +DBG_BF_ASSERT(0, "STRIP");return NULL; //STRIP001 //STRIP001 return new SwGetRefFieldType( pDoc ); /*N*/ } @@ -1024,7 +1024,7 @@ DBG_ASSERT(0, "STRIP");return NULL; //STRIP001 //STRIP001 return new SwGetRefF /*?*/ // dann gibt es im DestDoc RefFelder, also muessen im SourceDoc /*?*/ // alle RefFelder auf einduetige Ids in beiden Docs umgestellt /*?*/ // werden. -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 _RefIdsMap aFntMap( aEmptyStr ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 _RefIdsMap aFntMap( aEmptyStr ); //STRIP001 /*?*/ _RefIdsMaps aFldMap; //STRIP001 /*?*/ //STRIP001 /*?*/ SwClientIter aIter( *this ); diff --git a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx index 229f7323a..8894d3dd2 100644 --- a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_usrfld.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:20 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -358,7 +358,7 @@ void SwUserField::SetPar2(const String& rStr) /*N*/ /*N*/ // der SdrPage (und damit den VCControls) sagen, das sich was getan hat /*N*/ if( GetDoc()->GetDrawModel() && GetDepends() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 ((SwDPage*)GetDoc()->GetDrawModel()->GetPage( 0 ))-> +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ((SwDPage*)GetDoc()->GetDrawModel()->GetPage( 0 ))-> //STRIP001 /*?*/ UpdateLinkData( aName, aContent ); /*N*/ /*N*/ sal_Bool bModified = GetDoc()->IsModified(); diff --git a/binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx b/binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx index 1b80202ff..c78d07364 100644 --- a/binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx +++ b/binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_fefly1.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1459,7 +1459,7 @@ using namespace ::com::sun::star; /*N*/ 0 != ( pHts = pTNd->GetpSwpHints() )) /*N*/ { /*?*/ // search for a sequence field: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SfxPoolItem* pItem; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SfxPoolItem* pItem; //STRIP001 /*?*/ for( USHORT n = 0, nEnd = pHts->Count(); n < nEnd; ++n ) //STRIP001 /*?*/ if( RES_TXTATR_FIELD == ( pItem = //STRIP001 /*?*/ &(*pHts)[ n ]->GetAttr())->Which() && @@ -1510,7 +1510,7 @@ using namespace ::com::sun::star; /*N*/ aPt += pFly->Frm().Pos(); /*N*/ if ( rRect.Top() != LONG_MIN && rRect.Pos() != aPt ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aPt = rRect.Pos(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aPt = rRect.Pos(); //STRIP001 /*?*/ aPt.X() -= pFly->Prt().Left(); //STRIP001 /*?*/ aPt.Y() -= pFly->Prt().Top(); //STRIP001 /*?*/ //Bei Absatzgebundenen Flys muss ausgehend von der neuen Position ein @@ -1889,7 +1889,7 @@ using namespace ::com::sun::star; /*N*/ const SdrMarkList &rMrkList = Imp()->GetDrawView()->GetMarkList(); /*N*/ for( sal_uInt32 i = 0, nE = rMrkList.GetMarkCount(); i < nE; ++i ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SdrObject* pObj = rMrkList.GetMark( i )->GetObj(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SdrObject* pObj = rMrkList.GetMark( i )->GetObj(); //STRIP001 /*?*/ ObjCntType eTmp = GetObjCntType( *pObj ); //STRIP001 /*?*/ if( !i ) //STRIP001 /*?*/ { @@ -1970,7 +1970,7 @@ using namespace ::com::sun::star; //STRIP001 } /*M*/ static USHORT SwFmtGetPageNum(const SwFlyFrmFmt * pFmt) -/*M*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 /*?*/ ASSERT(pFmt != NULL, "invalid argument"); //STRIP001 /*?*/ //STRIP001 /*?*/ SwFlyFrm * pFrm = pFmt->GetFrm(); @@ -2119,9 +2119,9 @@ namespace binfilter {//STRIP009 /*M*/ int nChainState; /*M*/ /*M*/ if (bSuccessors) -/*?*/ {DBG_ASSERT(0, "STRIP");nChainState=0; }//STRIP001 nChainState = pDoc->Chainable(rFmt, rFmt1); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");nChainState=0; }//STRIP001 nChainState = pDoc->Chainable(rFmt, rFmt1); /*M*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");nChainState=0; }//STRIP001 nChainState = pDoc->Chainable(rFmt1, rFmt); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");nChainState=0; }//STRIP001 nChainState = pDoc->Chainable(rFmt1, rFmt); /*M*/ /*M*/ #if 0 /*M*/ ::std::clog << lcl_GetChainableString(nChainState) << ::std::endl; diff --git a/binfilter/bf_sw/source/core/frmedt/sw_feshview.cxx b/binfilter/bf_sw/source/core/frmedt/sw_feshview.cxx index 69c5b3d8d..77ba72027 100644 --- a/binfilter/bf_sw/source/core/frmedt/sw_feshview.cxx +++ b/binfilter/bf_sw/source/core/frmedt/sw_feshview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_feshview.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -235,7 +235,7 @@ namespace binfilter { /*N*/ BOOL SwFEShell::SelectObj( const Point& rPt, BYTE nFlag, SdrObject *pObj ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 SET_CURR_SHELL( this ); +DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 SET_CURR_SHELL( this ); //STRIP001 StartAction(); //Aktion ist Notwendig, damit nicht mehrere //STRIP001 //AttrChgdNotify (etwa durch Unmark->MarkListHasChgd) //STRIP001 //durchkommen @@ -2514,7 +2514,7 @@ bool SwFEShell::IsSelContainsControl() const /*N*/ ASSERT( pFrm->IsFlyFrm(), "Wrong FrmType" ); /*N*/ if( bSelFrm ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SelectObj( pFrm->Frm().Pos(), 0, ((SwFlyFrm*)pFrm)->GetVirtDrawObj() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SelectObj( pFrm->Frm().Pos(), 0, ((SwFlyFrm*)pFrm)->GetVirtDrawObj() ); //STRIP001 /*?*/ if( !ActionPend() ) //STRIP001 /*?*/ MakeVisible( pFrm->Frm() ); /*N*/ } @@ -2524,7 +2524,7 @@ bool SwFEShell::IsSelContainsControl() const /*N*/ SwCntntFrm *pCFrm = pFrm->ContainsCntnt(); /*N*/ if ( pCFrm ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwCntntNode *pCNode = pCFrm->GetNode(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwCntntNode *pCNode = pCFrm->GetNode(); //STRIP001 /*?*/ ClearMark(); //STRIP001 /*?*/ SwPaM* pCrsr = GetCrsr(); //STRIP001 /*?*/ @@ -2560,7 +2560,7 @@ bool SwFEShell::IsSelContainsControl() const /*N*/ if( Imp()->HasDrawView() && /*N*/ Imp()->GetDrawView()->GetMarkList().GetMarkCount() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 MakeVisible( Imp()->GetDrawView()->GetAllMarkedRect() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 MakeVisible( Imp()->GetDrawView()->GetAllMarkedRect() ); /*N*/ } /*N*/ else /*N*/ SwCrsrShell::MakeSelVisible(); @@ -2843,9 +2843,9 @@ bool SwFEShell::IsSelContainsControl() const /*N*/ void SwFEShell::HideChainMarker() /*N*/ { /*N*/ if ( pChainFrom ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pChainFrom->Hide(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pChainFrom->Hide(); /*N*/ if ( pChainTo ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pChainTo->Hide(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pChainTo->Hide(); /*N*/ } /*N*/ void SwFEShell::SetChainMarker() @@ -2858,7 +2858,7 @@ bool SwFEShell::IsSelContainsControl() const /*?*/ /*?*/ XPolygon aPoly(3); /*?*/ if ( pFly->GetPrevLink() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ bDelFrom = FALSE; //STRIP001 /*?*/ const SwFrm *pPre = pFly->GetPrevLink(); //STRIP001 /*?*/ aPoly[0] = Point( pPre->Frm().Right(), pPre->Frm().Bottom()); @@ -2870,7 +2870,7 @@ bool SwFEShell::IsSelContainsControl() const //STRIP001 /*?*/ pChainFrom->Show(); /*?*/ } /*?*/ if ( pFly->GetNextLink() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ bDelTo = FALSE; //STRIP001 /*?*/ const SwFlyFrm *pNxt = pFly->GetNextLink(); //STRIP001 /*?*/ aPoly[0] = Point( pFly->Frm().Right(), pFly->Frm().Bottom()); @@ -3141,7 +3141,7 @@ bool SwFEShell::IsSelContainsControl() const /*?*/ ASSERT( pPageFrm, "inconsistent modell - no page!"); /*?*/ if ( pPageFrm ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aRetColor = pPageFrm->GetDrawBackgrdColor(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aRetColor = pPageFrm->GetDrawBackgrdColor(); /*?*/ } /*?*/ } /*?*/ } diff --git a/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx b/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx index 0bcd249fa..79edfe87c 100644 --- a/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx +++ b/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_fetab.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -787,7 +787,7 @@ namespace binfilter { /*?*/ StartAllAction(); /*N*/ BOOL bRet = GetDoc()->BalanceRowHeight( GetShellCursor( *this ), bTstOnly ); /*N*/ if( !bTstOnly ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 EndAllActionAndCall(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 EndAllActionAndCall(); /*N*/ return bRet; /*N*/ } @@ -1930,7 +1930,7 @@ namespace binfilter { ---------------------------------------------------------------------------*/ /*M*/ BOOL SwFEShell::IsMouseTableRightToLeft(const Point &rPt) const -/*M*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 /*?*/ SwFrm *pFrm = (SwFrm *)GetBox( rPt ); //STRIP001 /*?*/ const SwTabFrm* pTabFrm = pFrm ? pFrm->ImplFindTabFrm() : 0; //STRIP001 /*?*/ ASSERT( pTabFrm, "Table not found" ); diff --git a/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx b/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx index e4f29ca62..2303b2b05 100644 --- a/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx +++ b/binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_tblsel.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:22:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -281,11 +281,11 @@ namespace binfilter { /*N*/ if( rBoxes.Count() ) /*?*/ rBoxes.Remove( USHORT(0), rBoxes.Count() ); /*N*/ if( rShell.IsTableMode() && 1 ) //STRIP001 ((SwCrsrShell&)rShell).UpdateTblSelBoxes()) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 rBoxes.Insert( &rShell.GetTableCrsr()->GetBoxes() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 rBoxes.Insert( &rShell.GetTableCrsr()->GetBoxes() ); /*N*/ } /*N*/ void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( rBoxes.Count() ) //STRIP001 rBoxes.Remove( USHORT(0), rBoxes.Count() ); //STRIP001 @@ -2211,7 +2211,7 @@ static const SwLayoutFrm *GetPrevCell( const SwLayoutFrm *pCell ) //STRIP001 } /*N*/ BOOL _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 _FndPara* pFndPara = (_FndPara*)pPara; //STRIP001 _FndLine* pFndLine = new _FndLine( (SwTableLine*)rpLine, pFndPara->pFndBox ); //STRIP001 _FndPara aPara( *pFndPara, pFndLine ); diff --git a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx index cd50a0ccd..c28aaae69 100644 --- a/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx +++ b/binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ndgrf.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:45 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -300,7 +300,7 @@ namespace binfilter { /*N*/ { /*N*/ // MIB 27.02.2001: Old stream must be deleted before the new one is set. /*N*/ if( HasStreamName() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName(); /*N*/ /*N*/ aGrfObj.SetGraphic( *pGraphic ); /*N*/ bReadGrf = TRUE; @@ -309,7 +309,7 @@ namespace binfilter { /*N*/ { /*N*/ // MIB 27.02.2001: Old stream must be deleted before the new one is set. /*?*/ if( HasStreamName() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName(); /*?*/ /*?*/ aGrfObj = *pGrfObj; /*?*/ if( pGrfObj->HasUserData() && pGrfObj->IsSwappedOut() ) @@ -324,7 +324,7 @@ namespace binfilter { /*N*/ else /*N*/ { /*N*/ if( HasStreamName() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName(); /*N*/ /*N*/ // einen neuen Grafik-Link anlegen /*N*/ InsertLink( rGrfName, rFltName ); @@ -386,7 +386,7 @@ namespace binfilter { /*N*/ else /*N*/ { /*N*/ if( !pDoc->IsInDtor() && HasStreamName() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelStreamName(); /*N*/ } /*N*/ //#39289# Die Frames muessen hier bereits geloescht weil der DTor der /*N*/ //Frms die Grafik noch fuer StopAnimation braucht. @@ -677,7 +677,7 @@ namespace binfilter { /*N*/ // its storage has to be removed. /*N*/ if( pRoot == pDocStg ) /*N*/ { - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ refStrm.Clear(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ refStrm.Clear(); //STRIP001 /*?*/ DelStreamName(); /*N*/ } /*N*/ aDstStrmName.Erase(); @@ -906,7 +906,7 @@ namespace binfilter { /*N*/ if( IsScaleImageMap() && nGrfSize.Width() && nGrfSize.Height() ) /*N*/ { /*N*/ // Image-Map an Grafik-Groesse anpassen - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScaleImageMap(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ScaleImageMap(); //STRIP001 /*?*/ //STRIP001 /*?*/ // Image-Map nicht noch einmal skalieren //STRIP001 /*?*/ SetScaleImageMap( FALSE ); @@ -1087,7 +1087,7 @@ namespace binfilter { /*N*/ else /*N*/ { /*N*/ if( aGrfObj.IsSwappedOut() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pThis->SwapIn(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pThis->SwapIn(); /*N*/ aTmpGrf = aGrfObj.GetGraphic(); /*N*/ } /*N*/ @@ -1121,7 +1121,7 @@ namespace binfilter { /*M*/ if( pGrfObj->IsInSwapOut() && (IsSelected() || bInSwapIn) ) /*M*/ pRet = GRFMGR_AUTOSWAPSTREAM_NONE; /*M*/ else if( refLink.Is() ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( pGrfObj->IsInSwapIn() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ // then make it by your self diff --git a/binfilter/bf_sw/source/core/inc/dbg_lay.hxx b/binfilter/bf_sw/source/core/inc/dbg_lay.hxx index 4952c834d..cbf66f930 100644 --- a/binfilter/bf_sw/source/core/inc/dbg_lay.hxx +++ b/binfilter/bf_sw/source/core/inc/dbg_lay.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dbg_lay.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:49 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ public: static ULONG Record() { return nRecord; } static void SetRecord( ULONG nNew ) { nRecord = nNew; } static BOOL Record( ULONG nFunc ) { return 0 != (( nFunc | PROT_INIT ) & nRecord); } - static void Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAction, void* pParam ){DBG_ASSERT(0, "STRIP");} //STRIP001 static void Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAction, void* pParam ); + static void Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAction, void* pParam ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 static void Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAction, void* pParam ); static void Init(); static void Stop(); //STRIP001 static void SnapShot( const SwFrm* pFrm, ULONG nFlags ); @@ -126,8 +126,8 @@ public: class SwEnterLeave { SwImplEnterLeave* pImpl; - void Ctor( const SwFrm* pFrm, ULONG nFunc, ULONG nAct, void* pPar ){DBG_ASSERT(0, "STRIP");} //STRIP001 void Ctor( const SwFrm* pFrm, ULONG nFunc, ULONG nAct, void* pPar ); - void Dtor(){DBG_ASSERT(0, "STRIP");} //STRIP001 void Dtor(); + void Ctor( const SwFrm* pFrm, ULONG nFunc, ULONG nAct, void* pPar ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void Ctor( const SwFrm* pFrm, ULONG nFunc, ULONG nAct, void* pPar ); + void Dtor(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void Dtor(); public: SwEnterLeave( const SwFrm* pFrm, ULONG nFunc, ULONG nAct, void* pPar ) { if( SwProtocol::Record( nFunc ) ) Ctor( pFrm, nFunc, nAct, pPar ); else pImpl = NULL; } diff --git a/binfilter/bf_sw/source/core/inc/frame.hxx b/binfilter/bf_sw/source/core/inc/frame.hxx index 5bc07786a..bbffb7ad1 100644 --- a/binfilter/bf_sw/source/core/inc/frame.hxx +++ b/binfilter/bf_sw/source/core/inc/frame.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frame.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:53 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -583,7 +583,7 @@ public: BOOL IsFtnAllowed() const; virtual void Modify( SfxPoolItem*, SfxPoolItem* ); - virtual void Format( const SwBorderAttrs *pAttrs = 0 ){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void Format( const SwBorderAttrs *pAttrs = 0 ); + virtual void Format( const SwBorderAttrs *pAttrs = 0 ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void Format( const SwBorderAttrs *pAttrs = 0 ); virtual void CheckDirection( BOOL bVert ); @@ -718,7 +718,7 @@ public: void InvalidatePage( const SwPageFrm *pPage = 0 ) const; virtual BOOL GetCrsrOfst( SwPosition *, Point&, - const SwCrsrMoveState* = 0 ) const{DBG_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 const SwCrsrMoveState* = 0 ) const; + const SwCrsrMoveState* = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 const SwCrsrMoveState* = 0 ) const; virtual BOOL GetCharRect( SwRect &, const SwPosition&, SwCrsrMoveState* = 0 ) const; //STRIP001 virtual void Paint( const SwRect& ) const; diff --git a/binfilter/bf_sw/source/core/inc/rootfrm.hxx b/binfilter/bf_sw/source/core/inc/rootfrm.hxx index 2f7276b64..2f22ecc14 100644 --- a/binfilter/bf_sw/source/core/inc/rootfrm.hxx +++ b/binfilter/bf_sw/source/core/inc/rootfrm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: rootfrm.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:58 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -211,8 +211,8 @@ public: // fuer bestimmte UNO-Aktionen (Tabellencursor) ist es notwendig, dass alle Actions // kurzfristig zurueckgesetzt werden. Dazu muss sich jede ViewShell ihren alten Action-zaehler // merken - void UnoRemoveAllActions(){DBG_ASSERT(0, "STRIP");} //STRIP001 void UnoRemoveAllActions(); - void UnoRestoreAllActions(){DBG_ASSERT(0, "STRIP");} //STRIP001 void UnoRestoreAllActions(); + void UnoRemoveAllActions(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void UnoRemoveAllActions(); + void UnoRestoreAllActions(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 void UnoRestoreAllActions(); const SdrPage* GetDrawPage() const { return pDrawPage; } SdrPage* GetDrawPage() { return pDrawPage; } diff --git a/binfilter/bf_sw/source/core/inc/sectfrm.hxx b/binfilter/bf_sw/source/core/inc/sectfrm.hxx index 65da2615f..7230f055f 100644 --- a/binfilter/bf_sw/source/core/inc/sectfrm.hxx +++ b/binfilter/bf_sw/source/core/inc/sectfrm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: sectfrm.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:49:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,7 +99,7 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm //STRIP001 BOOL IsEndnoteAtMyEnd() const; protected: virtual void MakeAll(); - virtual BOOL ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReformat ){DBG_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 virtual BOOL ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReformat ); + virtual BOOL ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReformat ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 virtual BOOL ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReformat ); virtual void Format( const SwBorderAttrs *pAttrs = 0 ); public: SwSectionFrm( SwSection & ); //Inhalt wird nicht erzeugt! diff --git a/binfilter/bf_sw/source/core/inc/swblocks.hxx b/binfilter/bf_sw/source/core/inc/swblocks.hxx index 9fd0158a9..f53d92abb 100644 --- a/binfilter/bf_sw/source/core/inc/swblocks.hxx +++ b/binfilter/bf_sw/source/core/inc/swblocks.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swblocks.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:00 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -239,7 +239,7 @@ class Sw3TextBlocks : public SwImpBlocks //STRIP001 BOOL bAutocorrBlock; public: - Sw3TextBlocks( const String& rFile): SwImpBlocks( rFile ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 Sw3TextBlocks( const String& ); + Sw3TextBlocks( const String& rFile): SwImpBlocks( rFile ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 Sw3TextBlocks( const String& ); //STRIP001 Sw3TextBlocks( SvStorage& ); //STRIP001 virtual ~Sw3TextBlocks(); //STRIP001 virtual ULONG Delete( USHORT ); diff --git a/binfilter/bf_sw/source/core/inc/txmsrt.hxx b/binfilter/bf_sw/source/core/inc/txmsrt.hxx index d22a6ba11..e5e7d8848 100644 --- a/binfilter/bf_sw/source/core/inc/txmsrt.hxx +++ b/binfilter/bf_sw/source/core/inc/txmsrt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: txmsrt.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:02 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,7 +114,7 @@ class SwTOXInternational public: SwTOXInternational( LanguageType nLang, USHORT nOptions, - const String& rSortAlgorithm ){DBG_ASSERT(0, "STRIP");} //STRIP001 const String& rSortAlgorithm ); + const String& rSortAlgorithm ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 const String& rSortAlgorithm ); //STRIP001 SwTOXInternational( const SwTOXInternational& ); //STRIP001 ~SwTOXInternational(); //STRIP001 @@ -170,7 +170,7 @@ struct SwTOXSortTabBase const SwCntntNode* pTOXSrc, const SwTxtTOXMark* pTxtMark, const SwTOXInternational* pIntl, - const ::com::sun::star::lang::Locale* pLocale = NULL ){DBG_ASSERT(0, "STRIP");} //STRIP001 const ::com::sun::star::lang::Locale* pLocale = NULL ); + const ::com::sun::star::lang::Locale* pLocale = NULL ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 const ::com::sun::star::lang::Locale* pLocale = NULL ); //STRIP001 USHORT GetType() const { return nType; } //STRIP001 USHORT GetOptions() const { return nOpt; } diff --git a/binfilter/bf_sw/source/core/inc/txtfrm.hxx b/binfilter/bf_sw/source/core/inc/txtfrm.hxx index 4a547ab0a..386c53188 100644 --- a/binfilter/bf_sw/source/core/inc/txtfrm.hxx +++ b/binfilter/bf_sw/source/core/inc/txtfrm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfrm.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:03 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -500,10 +500,10 @@ public: void SwapWidthAndHeight(); // Calculates the coordinates of a rectangle when switching from // horizontal to vertical layout. - void SwitchHorizontalToVertical( SwRect& rRect ) const{DBG_ASSERT(0, "STRIP");} ;//STRIP001 void SwitchHorizontalToVertical( SwRect& rRect ) const; + void SwitchHorizontalToVertical( SwRect& rRect ) const{DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void SwitchHorizontalToVertical( SwRect& rRect ) const; // Calculates the coordinates of a point when switching from // horizontal to vertical layout. - void SwitchHorizontalToVertical( Point& rPoint ) const{DBG_ASSERT(0, "STRIP");} ;//STRIP001 void SwitchHorizontalToVertical( Point& rPoint ) const; + void SwitchHorizontalToVertical( Point& rPoint ) const{DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void SwitchHorizontalToVertical( Point& rPoint ) const; // Calculates the a limit value when switching from // horizontal to vertical layout. long SwitchHorizontalToVertical( long nLimit ) const; diff --git a/binfilter/bf_sw/source/core/inc/wrong.hxx b/binfilter/bf_sw/source/core/inc/wrong.hxx index d649eaabf..4941c36b0 100644 --- a/binfilter/bf_sw/source/core/inc/wrong.hxx +++ b/binfilter/bf_sw/source/core/inc/wrong.hxx @@ -2,9 +2,9 @@ * * $RCSfile: wrong.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:04 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ public: //STRIP001 sal_Bool InWrongWord( xub_StrLen &rChk, xub_StrLen &rLn ) const; //STRIP001 xub_StrLen NextWrong( xub_StrLen nChk ) const; //STRIP001 xub_StrLen LastWrong( xub_StrLen nChk ) const; - void Move( xub_StrLen nPos, long nDiff ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void Move( xub_StrLen nPos, long nDiff ); + void Move( xub_StrLen nPos, long nDiff ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void Move( xub_StrLen nPos, long nDiff ); //STRIP001 void Clear(); //STRIP001 void Clear( xub_StrLen nBegin, xub_StrLen nEnd ); diff --git a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx index 7acce352a..04d641b0d 100644 --- a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_atrfrm.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-23 14:05:51 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -410,7 +410,7 @@ using namespace ::rtl; /*?*/ { /*?*/ if( aIter()->ISA( SwCrsrShell ) ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwCrsrShell*)aIter())->ParkCrsr( aIdx ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwCrsrShell*)aIter())->ParkCrsr( aIdx ); //STRIP001 /*?*/ aIdx = nEnd-1; //STRIP001 /*?*/ break; /*?*/ } diff --git a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx index 591ababb8..c7ee75123 100644 --- a/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_calcmove.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_calcmove.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1142,7 +1142,7 @@ namespace binfilter { /*N*/ SwFtnFrm* pFtn = FindFtnFrm(); /*N*/ SwCntntFrm* pRefCnt = pFtn ? pFtn->GetRef() : 0; /*N*/ if ( pRefCnt && !pRefCnt->IsValid() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwFtnBossFrm* pFtnBossOfFtn = pFtn->FindFtnBossFrm(); //STRIP001 /*?*/ SwFtnBossFrm* pFtnBossOfRef = pRefCnt->FindFtnBossFrm(); //STRIP001 /*?*/ //<loop of movefwd until condition held or no move> @@ -1638,7 +1638,7 @@ namespace binfilter { /*N*/ //Seite/Spalte liegt. /*N*/ SwFtnFrm* pFtnFrm = 0; /*N*/ if ( IsInFtn() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( !lcl_IsNextFtnBoss( pNewUpper, this ) ) //STRIP001 /*?*/ return TRUE; //STRIP001 /*?*/ pFtnFrm = FindFtnFrm(); diff --git a/binfilter/bf_sw/source/core/layout/sw_dbg_lay.cxx b/binfilter/bf_sw/source/core/layout/sw_dbg_lay.cxx index f466d57df..e0c7b0281 100644 --- a/binfilter/bf_sw/source/core/layout/sw_dbg_lay.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_dbg_lay.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_dbg_lay.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:24 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -199,7 +199,7 @@ namespace binfilter { //STRIP001 void CheckLine( ByteString& rLine ); //STRIP001 void SectFunc( ByteString &rOut, const SwFrm* pFrm, ULONG nAct, void* pParam ); /*N*/ public: - SwImplProtocol(){DBG_ASSERT(0, "STRIP");} //STRIP001 SwImplProtocol(); + SwImplProtocol(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SwImplProtocol(); //STRIP001 ~SwImplProtocol(); //STRIP001 // Aufzeichnen //STRIP001 void Record( const SwFrm* pFrm, ULONG nFunction, ULONG nAct, void* pParam ) @@ -301,7 +301,7 @@ namespace binfilter { /*N*/ SvFileStream aStream( aName, STREAM_READ ); /*N*/ if( aStream.IsOpen() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pImpl = new SwImplProtocol(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pImpl = new SwImplProtocol(); //STRIP001 /*?*/ pImpl->FileInit(); /*N*/ } /*N*/ aStream.Close(); diff --git a/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx index 5a69d4aaa..dae2fae9e 100644 --- a/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_findfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_findfrm.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -309,7 +309,7 @@ SwCntntFrm *SwPageFrm::FindLastBodyCntnt() @return true, if <this> is positioned before the layout frame <p> */ /*N*/ bool SwLayoutFrm::IsBefore( const SwLayoutFrm* _pCheckRefLayFrm ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 ASSERT( !IsRootFrm() , "<IsBefore> called at a <SwRootFrm>."); //STRIP001 ASSERT( !_pCheckRefLayFrm->IsRootFrm() , "<IsBefore> called with a <SwRootFrm>."); //STRIP001 diff --git a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx index aed4d4b02..8c2b7a761 100644 --- a/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_flowfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -778,7 +778,7 @@ namespace binfilter { /*N*/ SwLayoutFrm *SwFrm::GetLeaf( MakePageType eMakePage, BOOL bFwd ) /*N*/ { /*N*/ if ( IsInFtn() ) -/*?*/ { DBG_ASSERT(0, "STRIP");} //STRIP001 return bFwd ? GetNextFtnLeaf( eMakePage ) : GetPrevFtnLeaf( eMakePage ); +/*?*/ { DBG_BF_ASSERT(0, "STRIP");} //STRIP001 return bFwd ? GetNextFtnLeaf( eMakePage ) : GetPrevFtnLeaf( eMakePage ); /*N*/ if ( IsInSct() ) /*N*/ return bFwd ? GetNextSctLeaf( eMakePage ) : GetPrevSctLeaf( eMakePage ); /*N*/ return bFwd ? GetNextLeaf( eMakePage ) : GetPrevLeaf( eMakePage ); @@ -1370,7 +1370,7 @@ namespace binfilter { /*N*/ } /*N*/ else if( rThis.GetAttrSet()->GetDoc()->IsParaSpaceMaxAtPages() && /*N*/ 1) //STRIP001 CastFlowFrm( pOwn )->HasParaSpaceAtPages( rThis.IsSctFrm() ) ) -/*?*/ { DBG_ASSERT(0, "STRIP");} //STRIP001 nUpper = pAttrs->GetULSpace().GetUpper(); +/*?*/ { DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nUpper = pAttrs->GetULSpace().GetUpper(); /*N*/ /*N*/ nUpper += pAttrs->GetTopLine( &rThis ); /*N*/ @@ -1523,7 +1523,7 @@ namespace binfilter { /*N*/ //!!!!MoveFtnCntFwd muss ggf. mitgepflegt werden. /*N*/ SwFtnBossFrm *pOldBoss = rThis.FindFtnBossFrm(); /*N*/ if ( rThis.IsInFtn() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 return ((SwCntntFrm&)rThis).MoveFtnCntFwd( bMakePage, pOldBoss ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 return ((SwCntntFrm&)rThis).MoveFtnCntFwd( bMakePage, pOldBoss ); /*N*/ /*N*/ if( !IsFwdMoveAllowed() && !bMoveAlways ) /*N*/ { @@ -1894,7 +1894,7 @@ namespace binfilter { /*?*/ pNewUpper = (SwSectionFrm*)pTmp; /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pSct = new SwSectionFrm( *pSct, TRUE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pSct = new SwSectionFrm( *pSct, TRUE ); //STRIP001 /*?*/ pSct->Paste( pNewUpper ); //STRIP001 /*?*/ pSct->Init(); //STRIP001 /*?*/ pNewUpper = pSct; diff --git a/binfilter/bf_sw/source/core/layout/sw_fly.cxx b/binfilter/bf_sw/source/core/layout/sw_fly.cxx index ae7642d1f..338263b82 100644 --- a/binfilter/bf_sw/source/core/layout/sw_fly.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_fly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_fly.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -252,7 +252,7 @@ namespace binfilter { /*N*/ const SwFmtChain &rChain = pFmt->GetChain(); /*N*/ if ( rChain.GetPrev() || rChain.GetNext() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( rChain.GetNext() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( rChain.GetNext() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ SwFlyFrm *pFollow = FindChainNeighbour( *rChain.GetNext(), pAnch ); //STRIP001 /*?*/ if ( pFollow ) @@ -316,7 +316,7 @@ namespace binfilter { /*N*/ { /*N*/ SwRootFrm *pRootFrm = FindRootFrm(); /*N*/ if( pRootFrm && pRootFrm->IsAnyShellAccessible() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ViewShell *pVSh = pRootFrm->GetCurrShell(); //STRIP001 /*?*/ if( pVSh && pVSh->Imp() ) //STRIP001 /*?*/ { @@ -332,9 +332,9 @@ namespace binfilter { /*N*/ { /*N*/ //Aus der Verkettung loessen. /*N*/ if ( GetPrevLink() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 UnchainFrames( GetPrevLink(), this ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 UnchainFrames( GetPrevLink(), this ); /*N*/ if ( GetNextLink() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 UnchainFrames( this, GetNextLink() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 UnchainFrames( this, GetNextLink() ); /*N*/ /*N*/ //Unterstruktur zerstoeren, wenn dies erst im LayFrm DTor passiert ist's /*N*/ //zu spaet, denn dort ist die Seite nicht mehr erreichbar (muss sie aber @@ -808,7 +808,7 @@ namespace binfilter { /*M*/ break; /*M*/ /*M*/ case RES_PROTECT: -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const SvxProtectItem *pP = (SvxProtectItem*)pNew; //STRIP001 /*?*/ GetVirtDrawObj()->SetMoveProtect( pP->IsPosProtected() ); //STRIP001 /*?*/ GetVirtDrawObj()->SetResizeProtect( pP->IsSizeProtected() ); @@ -831,7 +831,7 @@ namespace binfilter { /*M*/ /*M*/ case RES_FRM_SIZE: /*M*/ case RES_FMT_CHG: -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ const SwFmtFrmSize &rNew = GetFmt()->GetFrmSize(); //STRIP001 /*?*/ if ( FrmSizeChg( rNew ) ) //STRIP001 /*?*/ NotifyDrawObj(); @@ -956,7 +956,7 @@ namespace binfilter { /*M*/ break; /*M*/ /*M*/ case RES_OPAQUE: -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if ( pSh ) //STRIP001 /*?*/ pSh->InvalidateWindows( Frm() ); //STRIP001 /*?*/ const BYTE nId = ((SvxOpaqueItem*)pNew)->GetValue() ? @@ -997,7 +997,7 @@ namespace binfilter { /*M*/ break; /*M*/ /*M*/ case RES_CHAIN: -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwFmtChain *pChain = (SwFmtChain*)pNew; //STRIP001 /*?*/ if ( pChain->GetNext() ) //STRIP001 /*?*/ { @@ -1359,7 +1359,7 @@ namespace binfilter { /*N*/ pSect = (SwSectionFrm*)pLay; /*N*/ if( pSect->IsEndnAtEnd() && !bNoColl ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bCollect = TRUE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bCollect = TRUE; //STRIP001 /*?*/ SwLayouter::CollectEndnotes( pLay->GetFmt()->GetDoc(), pSect ); /*N*/ } /*N*/ pSect->CalcFtnCntnt(); @@ -1378,7 +1378,7 @@ namespace binfilter { /*?*/ if( pSect->IsEndnAtEnd() ) /*?*/ { /*?*/ if( bCollect ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pLay->GetFmt()->GetDoc()->GetLayouter()-> +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pLay->GetFmt()->GetDoc()->GetLayouter()-> //STRIP001 /*?*/ InsertEndnotes( pSect ); /*?*/ BOOL bLock = pSect->IsFtnLock(); /*?*/ pSect->SetFtnLock( TRUE ); @@ -1529,7 +1529,7 @@ namespace binfilter { /*N*/ { /*N*/ if( bCollect ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pLay->GetFmt()->GetDoc()->GetLayouter()->InsertEndnotes(pSect); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pLay->GetFmt()->GetDoc()->GetLayouter()->InsertEndnotes(pSect); //STRIP001 /*?*/ pSect->CalcFtnCntnt(); /*N*/ } /*N*/ if( pSect->HasFollow() ) @@ -2205,7 +2205,7 @@ void SwFrm::AppendVirtDrawObj( SwDrawContact* _pDrawContact, /*N*/ // Notify accessible layout. /*N*/ ViewShell* pSh = GetShell(); /*N*/ if( pSh && pSh->GetLayout()->IsAnyShellAccessible() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pSh->Imp()->DisposeAccessibleObj( pToRemove->GetMaster() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pSh->Imp()->DisposeAccessibleObj( pToRemove->GetMaster() ); /*N*/ #endif /*N*/ SwPageFrm *pPage = pToRemove->GetPage(); /*N*/ if ( pPage && pPage->GetSortedObjs() ) diff --git a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx index ce29bf29a..6af8d71f1 100644 --- a/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_flycnt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -336,7 +336,7 @@ namespace binfilter { /*N*/ FASTBOOL IsInProgress( const SwFlyFrm *pFly ) /*N*/ { - DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 return SwOszControl::IsInProgress( pFly ); + DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 return SwOszControl::IsInProgress( pFly ); /*N*/ } /*N*/ FASTBOOL SwOszControl::IsInProgress( const SwFlyFrm *pFly ) @@ -1562,7 +1562,7 @@ namespace binfilter { // Wer weicht wem aus bzw. welcher Bereich ist "linker"/"rechter" als welcher? /*N*/ BOOL MA_FASTCALL lcl_Minor( SwRelationOrient eRelO, SwRelationOrient eRelO2, /*N*/ BOOL bLeft ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 // Die Ausweichreihenfolge der SwRelationOrient-Enums bei linker Ausrichtung //STRIP001 static USHORT __READONLY_DATA aLeft[ LAST_ENUM_DUMMY ] = //STRIP001 { 5, 6, 0, 1, 8, 4, 7, 2, 3 }; diff --git a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx index 350e6859a..9b8644e09 100644 --- a/binfilter/bf_sw/source/core/layout/sw_flylay.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_flylay.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_flylay.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:27 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -622,7 +622,7 @@ namespace binfilter { /*N*/ static_cast< SwRootFrm * >( GetUpper() )->IsAnyShellAccessible() && /*N*/ static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell()->Imp() +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell()->Imp() //STRIP001 /*?*/ ->AddAccessibleFrm( pNew ); /*N*/ } /*N*/ #endif @@ -682,7 +682,7 @@ namespace binfilter { /*N*/ static_cast< SwRootFrm * >( GetUpper() )->IsAnyShellAccessible() && /*N*/ static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell()->Imp() +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell()->Imp() //STRIP001 /*?*/ ->DisposeAccessibleFrm( pToRemove, sal_True ); /*N*/ } /*N*/ #endif @@ -737,7 +737,7 @@ namespace binfilter { /*N*/ static_cast< SwRootFrm * >( GetUpper() )->IsAnyShellAccessible() && /*N*/ static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell()->Imp() +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell()->Imp() //STRIP001 /*?*/ ->DisposeAccessibleFrm( pToMove, sal_True ); /*N*/ } /*N*/ #endif @@ -772,7 +772,7 @@ namespace binfilter { /*N*/ static_cast< SwRootFrm * >( GetUpper() )->IsAnyShellAccessible() && /*N*/ static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell()->Imp() +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static_cast< SwRootFrm * >( GetUpper() )->GetCurrShell()->Imp() //STRIP001 /*?*/ ->AddAccessibleFrm( pToMove ); /*N*/ } /*N*/ #endif diff --git a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx index 52bbbd338..304911eeb 100644 --- a/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_frmtool.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -320,7 +320,7 @@ namespace binfilter { /*N*/ if( pRootFrm && pRootFrm->IsAnyShellAccessible() && /*N*/ pRootFrm->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( pFrm, aFrm ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( pFrm, aFrm ); /*N*/ } /*N*/ } /*N*/ @@ -947,7 +947,7 @@ namespace binfilter { /*?*/ aAnch.SetPageNum( pPage->GetPhyPageNum() ); /*?*/ pFmt->SetAttr( aAnch ); /*?*/ if ( RES_DRAWFRMFMT != pFmt->Which() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pFmt->MakeFrms(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pFmt->MakeFrms(); /*N*/ } /*N*/ } /*N*/ } @@ -1522,7 +1522,7 @@ bool lcl_InHeaderOrFooter( SwFrmFmt& _rFmt ) /*N*/ { /*N*/ #ifndef PRODUCT /*N*/ #if OSL_DEBUG_LEVEL > 1 -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDoc->GetLayoutCache()->CompareLayout( *pDoc ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDoc->GetLayoutCache()->CompareLayout( *pDoc ); /*N*/ #endif /*N*/ #endif /*N*/ pDoc->GetLayoutCache()->ClearImpl(); @@ -1694,7 +1694,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, // Wenn in einen SectionFrm ein anderer eingefuegt wird, // muss dieser aufgebrochen werden if( pSct && rSttIdx.GetNode().IsSectionNode() ) - {DBG_ASSERT(0, "STRIP"); //STRIP001 + {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 bSplit = pSct->SplitSect( pFrm, bApres ); //STRIP001 // Wenn pSct nicht aufgespalten werden konnte //STRIP001 if( !bSplit && !bApres ) diff --git a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx index 11bc5f49c..c13ffdbcc 100644 --- a/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ftnfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1506,7 +1506,7 @@ namespace binfilter { /*?*/ BOOL bEndnt = pNew->GetAttr()->GetFtn().IsEndNote(); /*?*/ if( bEndnt ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwSectionFmt* pEndFmt = pMySect->GetEndSectFmt(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwSectionFmt* pEndFmt = pMySect->GetEndSectFmt(); //STRIP001 /*?*/ bDontLeave = 0 != pEndFmt; //STRIP001 /*?*/ if( pSibling ) //STRIP001 /*?*/ { @@ -1883,7 +1883,7 @@ namespace binfilter { /*?*/ SwFtnContFrm* pFtnCont = pSct->FindFtnBossFrm(!bEnd)->FindFtnCont(); /*?*/ if( pFtnCont ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFtnFrm* pTmp = (SwFtnFrm*)pFtnCont->Lower(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFtnFrm* pTmp = (SwFtnFrm*)pFtnCont->Lower(); //STRIP001 /*?*/ if( bEnd ) //STRIP001 /*?*/ while( pTmp && !pTmp->GetAttr()->GetFtn().IsEndNote() ) //STRIP001 /*?*/ pTmp = (SwFtnFrm*)pTmp->GetNext(); @@ -2821,7 +2821,7 @@ namespace binfilter { /*?*/ if ( pNewBoss == pOldBoss ) /*?*/ return FALSE; /*?*/ -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 BOOL bMoved = FALSE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 BOOL bMoved = FALSE; //STRIP001 /*?*/ if( !pStart ) //STRIP001 /*?*/ pStart = ContainsCntnt(); //STRIP001 /*?*/ diff --git a/binfilter/bf_sw/source/core/layout/sw_layact.cxx b/binfilter/bf_sw/source/core/layout/sw_layact.cxx index f5d9eae31..6055f93fe 100644 --- a/binfilter/bf_sw/source/core/layout/sw_layact.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_layact.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_layact.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:23:00 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -278,7 +278,7 @@ namespace binfilter { /*N*/ /*N*/ if ( pFly == pSelfFly || !rRect.IsOver( pFly->Frm() ) ) /*N*/ continue; -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if ( pSelfFly && pSelfFly->IsLowerOf( pFly ) ) //STRIP001 /*?*/ continue; //STRIP001 /*?*/ @@ -1804,7 +1804,7 @@ namespace binfilter { /*N*/ pRootFrm = pPage->FindRootFrm(); /*N*/ if( pRootFrm && pRootFrm->IsAnyShellAccessible() && /*N*/ pRootFrm->GetCurrShell() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( pLow, aOldFrm ); /*N*/ } /*N*/ } @@ -1901,7 +1901,7 @@ namespace binfilter { // OD 31.10.2002 #104100# // NOTE: no adjustments for vertical layout support necessary /*N*/ BOOL CheckPos( SwFrm *pFrm ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !pFrm->GetValidPosFlag() ) //STRIP001 { //STRIP001 Point aOld( pFrm->Frm().Pos() ); @@ -2257,7 +2257,7 @@ namespace binfilter { /*N*/ if ( bBrowse && !IsIdle() && !IsCalcLayout() && !IsComplete() && /*N*/ pCntnt->Frm().Top() > pImp->GetShell()->VisArea().Bottom()) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const long nBottom = pImp->GetShell()->VisArea().Bottom(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const long nBottom = pImp->GetShell()->VisArea().Bottom(); //STRIP001 /*?*/ const SwFrm *pTmp = lcl_FindFirstInvaCntnt( pPage, //STRIP001 /*?*/ nBottom, pCntnt ); //STRIP001 /*?*/ if ( !pTmp ) @@ -2642,7 +2642,7 @@ namespace binfilter { /*?*/ const SwCntntFrm *pCnt = pPage->ContainsCntnt(); /*?*/ while( pCnt && pPage->IsAnLower( pCnt ) ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( _FormatSpelling( pCnt ) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( _FormatSpelling( pCnt ) ) //STRIP001 /*?*/ return TRUE; //STRIP001 /*?*/ pCnt = pCnt->GetNextCntntFrm(); /*?*/ } @@ -2658,7 +2658,7 @@ namespace binfilter { /*?*/ const SwCntntFrm *pC = pFly->ContainsCntnt(); /*?*/ while( pC ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if ( pC->IsTxtFrm() && _FormatSpelling( pC ) ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( pC->IsTxtFrm() && _FormatSpelling( pC ) ) //STRIP001 /*?*/ return TRUE; //STRIP001 /*?*/ pC = pC->GetNextCntntFrm(); /*?*/ } @@ -2929,7 +2929,7 @@ namespace binfilter { /*?*/ FASTBOOL bUnlock = FALSE; /*?*/ if ( pImp->GetRegion() || pImp->GetScrollRects() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp->DelRegions(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pImp->DelRegions(); //STRIP001 /*?*/ //STRIP001 /*?*/ //Fuer Repaint mit virtuellem Device sorgen. //STRIP001 /*?*/ pSh->LockPaint(); @@ -2944,7 +2944,7 @@ namespace binfilter { /*?*/ // pSh->EndAction(); /*?*/ if( bUnlock ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( bCrsrShell ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( bCrsrShell ) //STRIP001 /*?*/ { //STRIP001 /*?*/ // UnlockPaint overwrite the selection from the //STRIP001 /*?*/ // CrsrShell and calls the virtual method paint diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx index eddbf6ef7..0ed22bdc3 100644 --- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_laycache.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:29 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -241,7 +241,7 @@ namespace binfilter { /*N*/ break; /*N*/ } /*N*/ default: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aIo.SkipRec(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aIo.SkipRec(); /*N*/ break; /*N*/ } /*N*/ } diff --git a/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx index 00b1f0c2d..342d0c997 100644 --- a/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_newfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_newfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:30 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -618,7 +618,7 @@ namespace binfilter { /*N*/ bTurboAllowed = FALSE; /*N*/ pTurbo = 0; /*N*/ if(pBlink) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pBlink->FrmDelete( this ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pBlink->FrmDelete( this ); /*N*/ ((SwFrmFmt*)pRegisteredIn)->GetDoc()->DelFrmFmt( (SwFrmFmt*)pRegisteredIn ); /*N*/ delete pDestroy; /*N*/ diff --git a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx index 20b4e7e32..1004ba2ff 100644 --- a/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_pagechg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_pagechg.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:23:00 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -728,7 +728,7 @@ namespace binfilter { /*N*/ break; /*N*/ /*N*/ case RES_PAGEDESC_FTNINFO: -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //Die derzeit einzig sichere Methode: +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //Die derzeit einzig sichere Methode: //STRIP001 /*?*/ ((SwRootFrm*)GetUpper())->SetSuperfluous(); //STRIP001 /*?*/ SetMaxFtnHeight( pDesc->GetFtnInfo().GetHeight() ); //STRIP001 /*?*/ if ( !GetMaxFtnHeight() ) @@ -1939,7 +1939,7 @@ void SwRootFrm::RemoveSuperfluous() /*N*/ ((const SwTabFrm *)pFrm)->GetTable() /*N*/ ->GetHTMLTableLayout(); /*N*/ if ( pLayoutInfo ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nWidth = Min( nWidth, pLayoutInfo->GetBrowseWidthMin() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nWidth = Min( nWidth, pLayoutInfo->GetBrowseWidthMin() ); /*N*/ /*N*/ switch ( rHori.GetHoriOrient() ) /*N*/ { diff --git a/binfilter/bf_sw/source/core/layout/sw_paintfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_paintfrm.cxx index 138077c8f..2d6cb2a3a 100644 --- a/binfilter/bf_sw/source/core/layout/sw_paintfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_paintfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_paintfrm.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:51 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -4551,7 +4551,7 @@ void lcl_CompPxPosAndAdjustPos( const OutputDevice& _rOut, /*N*/ const SwRect& _rPageRect, /*N*/ ViewShell* _pViewShell, /*N*/ SwRect& _orBorderAndShadowBoundRect ) const -/*N*/ {DBG_ASSERT(0, "STRIP");//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 SwRect aTmpRect; //STRIP001 GetBorderRect( _rPageRect, _pViewShell, _orBorderAndShadowBoundRect ); //STRIP001 GetRightShadowRect( _rPageRect, _pViewShell, aTmpRect ); diff --git a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx index a70bacfcd..922a48014 100644 --- a/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_sectfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:33 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -789,7 +789,7 @@ namespace binfilter { /*N*/ } /*N*/ // Der Inhalt wird eingefuegt.. /*N*/ if( pSave ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ lcl_InvalidateInfFlags( pSave, bSize ); //STRIP001 /*?*/ ::RestoreCntnt( pSave, pUp, pPrv ); //STRIP001 /*?*/ pUp->FindPageFrm()->InvalidateCntnt(); @@ -902,7 +902,7 @@ namespace binfilter { /*N*/ SwSectionFrm *pSect = this; /*N*/ if( nMode ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwSectionFmt *pFmt = IsEndnAtEnd() ? GetEndSectFmt() : +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwSectionFmt *pFmt = IsEndnAtEnd() ? GetEndSectFmt() : //STRIP001 /*?*/ pSection->GetFmt(); //STRIP001 /*?*/ do { //STRIP001 /*?*/ while( pSect->HasFollow() ) @@ -933,7 +933,7 @@ namespace binfilter { /*N*/ } /*N*/ BOOL SwSectionFrm::CalcMinDiff( SwTwips& rMinDiff ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 if( ToMaximize( TRUE ) ) //STRIP001 { //STRIP001 SWRECTFN( this ) @@ -1084,7 +1084,7 @@ namespace binfilter { /*N*/ (Prt().*fnRect->fnGetTop)() > (Frm().*fnRect->fnGetHeight)() ); /*N*/ if( !bCalc && !bGrow && IsAnyNoteAtEnd() && !IsInFtn() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwSectionFrm *pSect = this; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwSectionFrm *pSect = this; //STRIP001 /*?*/ BOOL bEmpty = FALSE; //STRIP001 /*?*/ SwLayoutFrm* pFtn = IsEndnAtEnd() ? //STRIP001 /*?*/ lcl_FindEndnote( pSect, bEmpty, NULL ) : NULL; @@ -2282,7 +2282,7 @@ namespace binfilter { /*?*/ //nicht auf das alte Spaltenattribut verlassen. Da diese /*?*/ //wenigstens anzahlgemass fuer ChgColumns vorliegen muessen, /*?*/ //bleibt uns nur einen temporaeres Attribut zu basteln. -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFmtCol aCol; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFmtCol aCol; //STRIP001 /*?*/ if ( Lower() && Lower()->IsColumnFrm() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ USHORT nCol = 0; @@ -2334,7 +2334,7 @@ namespace binfilter { /*?*/ case RES_END_AT_TXTEND: /*?*/ if( !IsInFtn() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bOld = IsEndnAtEnd(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bOld = IsEndnAtEnd(); //STRIP001 /*?*/ BOOL bMyOld = IsEndnoteAtMyEnd(); //STRIP001 /*?*/ CalcEndAtEndFlag(); //STRIP001 /*?*/ if( bOld != IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd()) @@ -2355,7 +2355,7 @@ namespace binfilter { /*?*/ break; /*M*/ /*M*/ case RES_PROTECT: -/*M*/ { DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ { DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ViewShell *pSh = GetShell(); //STRIP001 /*?*/ if( pSh && pSh->GetLayout()->IsAnyShellAccessible() ) //STRIP001 /*?*/ pSh->Imp()->InvalidateAccessibleEditableState( sal_True, this ); @@ -2404,7 +2404,7 @@ namespace binfilter { /*?*/ BOOL bRet = FALSE; /*?*/ while( pCont && !bRet ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pCont->FindFootNote() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pCont->FindFootNote() ) //STRIP001 /*?*/ bRet = TRUE; //STRIP001 /*?*/ else //STRIP001 /*?*/ pCont = ContainsFtnCont( pCont ); diff --git a/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx index b6bc01a61..4d13ecc94 100644 --- a/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ssfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:34 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -310,7 +310,7 @@ namespace binfilter { /*N*/ SetInvalidR2L( TRUE ); /*N*/ BOOL bChg = bOldR2L != IsRightToLeft(); /*N*/ if( ( IsVertical() != bOldVert ) || bChg || IsReverse() != bOldRev ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 InvalidateAll(); //STRIP001 if( IsLayoutFrm() ) //STRIP001 { @@ -467,7 +467,7 @@ namespace binfilter { /*?*/ ViewShell *pVSh = pRootFrm->GetCurrShell(); /*?*/ if( pVSh && pVSh->Imp() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ASSERT( !GetLower(), "Lowers should be dispose already!" ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ASSERT( !GetLower(), "Lowers should be dispose already!" ); //STRIP001 /*?*/ pVSh->Imp()->DisposeAccessibleFrm( this ); /*?*/ } /*N*/ } @@ -568,7 +568,7 @@ namespace binfilter { /*?*/ } /*?*/ while( nPos < rFtnIdxs.Count() ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pTxtFtn = rFtnIdxs[ nPos ]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pTxtFtn = rFtnIdxs[ nPos ]; //STRIP001 /*?*/ if( pTxtFtn->GetTxtNode().GetIndex() > nIndex ) //STRIP001 /*?*/ break; //STRIP001 /*?*/ pTxtFtn->DelFrms(); diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx index 2cd8e9de2..174769d77 100644 --- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_tabfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:34 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -594,7 +594,7 @@ namespace binfilter { /*N*/ } /*N*/ /*N*/ if ( bResizeHTMLTable ) //Optimiertes Zusammenspiel mit Grow/Shrink des Inhaltes -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ bResizeHTMLTable = FALSE; //STRIP001 /*?*/ SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout(); //STRIP001 /*?*/ if ( pLayout ) @@ -656,7 +656,7 @@ namespace binfilter { /*N*/ { /*N*/ SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout(); /*N*/ if( pLayout ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ delete pAccess; //STRIP001 /*?*/ bCalcLowers |= pLayout->Resize( //STRIP001 /*?*/ pLayout->GetBrowseWidthByTabFrm( *this ), FALSE ); @@ -701,7 +701,7 @@ namespace binfilter { /*N*/ if ( /*!bOptLower &&*/ pLayout && /*N*/ ((Prt().*fnRect->fnGetWidth)() != nOldPrtWidth || /*N*/ (Frm().*fnRect->fnGetWidth)() != nOldFrmWidth) ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ delete pAccess; //STRIP001 /*?*/ bCalcLowers |= pLayout->Resize( //STRIP001 /*?*/ pLayout->GetBrowseWidthByTabFrm( *this ), FALSE ); @@ -750,7 +750,7 @@ namespace binfilter { /*N*/ SwHTMLTableLayout *pLayout = /*N*/ GetTable()->GetHTMLTableLayout(); /*N*/ if( pLayout ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ delete pAccess; //STRIP001 /*?*/ bCalcLowers |= pLayout->Resize( //STRIP001 /*?*/ pLayout->GetBrowseWidthByTabFrm( @@ -833,7 +833,7 @@ namespace binfilter { /*N*/ SwHTMLTableLayout *pLayout = /*N*/ GetTable()->GetHTMLTableLayout(); /*N*/ if( pLayout ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ delete pAccess; //STRIP001 /*?*/ bCalcLowers |= pLayout->Resize( //STRIP001 /*?*/ pLayout->GetBrowseWidthByTabFrm( *this ), @@ -1519,11 +1519,11 @@ namespace binfilter { /*N*/ if( pRootFrm && pRootFrm->IsAnyShellAccessible() && /*N*/ pRootFrm->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); /*N*/ } /*N*/ } /*N*/ else -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ASSERT( !this, "Table without Upper" ); //STRIP001 /*?*/ SwRect aOldFrm( Frm() ); //STRIP001 /*?*/ nHeight = (Frm().*fnRect->fnGetHeight)(); @@ -2402,7 +2402,7 @@ namespace binfilter { /*N*/ if( pRootFrm && pRootFrm->IsAnyShellAccessible() && /*N*/ pRootFrm->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( pFrm, aOldFrm ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( pFrm, aOldFrm ); /*N*/ } /*N*/ pFrm->_InvalidatePrt(); /*N*/ } @@ -2608,7 +2608,7 @@ namespace binfilter { /*N*/ if( pRootFrm && pRootFrm->IsAnyShellAccessible() && /*N*/ pRootFrm->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->DisposeAccessibleFrm( this, sal_True ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->DisposeAccessibleFrm( this, sal_True ); /*N*/ } /*N*/ pMod->Remove( this ); // austragen, /*N*/ pMod->Remove( this ); // austragen, @@ -2923,7 +2923,7 @@ namespace binfilter { /*M*/ if( (bAttrSetChg && /*M*/ SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_PROTECT, FALSE )) || /*M*/ RES_PROTECT == pNew->Which() ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ViewShell *pSh = GetShell(); //STRIP001 /*?*/ if( pSh && pSh->GetLayout()->IsAnyShellAccessible() ) //STRIP001 /*?*/ pSh->Imp()->InvalidateAccessibleEditableState( sal_True, this ); diff --git a/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx index c81bdbc45..0e7a58786 100644 --- a/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_trvlfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:35 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -574,7 +574,7 @@ namespace binfilter { //Frame in wiederholter Headline? /*N*/ FASTBOOL lcl_IsInRepeatedHeadline( const SwFrm *pFrm, /*N*/ const SwTabFrm** ppTFrm = 0 ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 const SwTabFrm *pTab = pFrm->FindTabFrm(); //STRIP001 if( ppTFrm ) //STRIP001 *ppTFrm = pTab; diff --git a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx index eb12f6b91..d7d286fb4 100644 --- a/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_wsfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:50:36 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -869,7 +869,7 @@ namespace binfilter { /*N*/ { /*N*/ ViewShell* pShell = pRootFrm->GetCurrShell(); /*N*/ if( pShell != NULL ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pShell->Imp()->DisposeAccessibleFrm( pTableFrm, sal_True ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pShell->Imp()->DisposeAccessibleFrm( pTableFrm, sal_True ); /*N*/ } /*N*/ } /*N*/ } @@ -2385,7 +2385,7 @@ namespace binfilter { /*N*/ if( pRootFrm && pRootFrm->IsAnyShellAccessible() && /*N*/ pRootFrm->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); /*N*/ } /*N*/ } /*N*/ return nReal; @@ -2494,7 +2494,7 @@ namespace binfilter { /*N*/ if( pRootFrm && pRootFrm->IsAnyShellAccessible() && /*N*/ pRootFrm->GetCurrShell() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); /*N*/ } /*N*/ } /*N*/ if ( !bTst && (IsCellFrm() || IsColumnFrm() ? nReal : nRealDist) ) @@ -3624,7 +3624,7 @@ namespace binfilter { /*?*/ { /*?*/ // Siehe oben bei Tabellen /*?*/ if( !pLastSctCnt ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pLastSctCnt = lcl_InvalidateSection( pCnt, nInv ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pLastSctCnt = lcl_InvalidateSection( pCnt, nInv ); /*?*/ if( pLastSctCnt == pCnt ) /*?*/ pLastSctCnt = NULL; /*?*/ } @@ -3647,7 +3647,7 @@ namespace binfilter { /*?*/ // diesem die Invalidierung bis zu dreimal durchgefuehrt, das ist vertretbar. /*?*/ if( !pLastTabCnt ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pLastTabCnt = lcl_InvalidateTable( pCnt->FindTabFrm(), nInv ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pLastTabCnt = lcl_InvalidateTable( pCnt->FindTabFrm(), nInv ); //STRIP001 /*?*/ pLastSctCnt = NULL; /*?*/ } /*?*/ if( pLastTabCnt == pCnt ) diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx index 42780f586..e5a29eb1a 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_sw3block.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:52 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -709,7 +709,7 @@ sal_Char __FAR_DATA N_BLOCKINFO[] = "AutotextInfo"; /*N*/ // Haben wir schon einen Persist? /*N*/ if( pDoc->GetPersist() ) /*N*/ return TRUE; - DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 /*?*/ pPersist = new Sw3Persist; + DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 /*?*/ pPersist = new Sw3Persist; //STRIP001 /*?*/ if( pPersist->DoOwnerLoad( pRoot ) ) //STRIP001 /*?*/ { //STRIP001 /*?*/ pDoc->SetPersist( pPersist ); diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx index bc955ddfa..dd098071f 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_sw3style.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:23:01 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -903,7 +903,7 @@ sal_Bool lcl_sw3io_isStarSymbolFontItem( const SvxFontItem& rFontItem ); /*N*/ } /*N*/ else if( p->pCondColls ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwTxtFmtColl* pDer = (*rDoc.GetTxtFmtColls())[ 0 ]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwTxtFmtColl* pDer = (*rDoc.GetTxtFmtColls())[ 0 ]; //STRIP001 /*?*/ pFmt = rDoc.MakeCondTxtFmtColl( p->GetName(), pDer ); /*N*/ } /*N*/ else @@ -916,7 +916,7 @@ sal_Bool lcl_sw3io_isStarSymbolFontItem( const SvxFontItem& rFontItem ); /*N*/ // im Doc gesetzt. /*N*/ pFmt->SetPoolFmtId( p->nId ); /*N*/ if( p->aHelpFile.Len() ) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pFmt->SetPoolHlpFileId +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ pFmt->SetPoolHlpFileId //STRIP001 /*?*/ ( (BYTE) rDoc.SetDocPattern( p->aHelpFile ) ); /*N*/ pFmt->SetPoolHelpId( (USHORT)p->nHelpId ); /*N*/ } @@ -1066,7 +1066,7 @@ sal_Bool lcl_sw3io_isStarSymbolFontItem( const SvxFontItem& rFontItem ); /*?*/ SwTxtFmtColl* pDColl = rDoc.FindTxtFmtCollByName( pCColl->sColl ); /*?*/ if( pDColl ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwConditionTxtFmtColl*)p->pFmt)->InsertCondition( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwConditionTxtFmtColl*)p->pFmt)->InsertCondition( //STRIP001 /*?*/ SwCollCondition( pDColl, //STRIP001 /*?*/ pCColl->nCondition, pCColl->nSubCondition )); /*?*/ } @@ -1153,7 +1153,7 @@ sal_Bool lcl_sw3io_isStarSymbolFontItem( const SvxFontItem& rFontItem ); /*N*/ // Bisher wurde allenfalls der Drawing-Layer gelesen. Deshalb /*N*/ // kann es hier noch gar keine RecSizes geben. Besser ist aber besser ... /*N*/ if( HasRecSizes() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ FlushRecSizes(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ FlushRecSizes(); /*N*/ /*N*/ SfxItemPool *pTmp = pDoc->GetAttrPool().GetSecondaryPool(); /*N*/ pDoc->GetAttrPool().SetSecondaryPool( 0 ); @@ -1309,7 +1309,7 @@ sal_Bool lcl_sw3io_isStarSymbolFontItem( const SvxFontItem& rFontItem ); /*N*/ // Bisher wurde allenfalls der Drawing-Layer gespeichert. Deshalb /*N*/ // kann es hier noch gar keine RecSizes geben. Besser ist aber besser ... /*N*/ if( HasRecSizes() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ FlushRecSizes(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ FlushRecSizes(); /*N*/ /*N*/ SfxItemPool *pTmp = pDoc->GetAttrPool().GetSecondaryPool(); /*N*/ pDoc->GetAttrPool().SetSecondaryPool( 0 ); diff --git a/binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx b/binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx index 4b36e6fef..cb1b77439 100644 --- a/binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx +++ b/binfilter/bf_sw/source/core/swg/sw_SwXMLSectionList.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_SwXMLSectionList.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-12-05 15:10:59 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,7 +94,7 @@ sal_Char __READONLY_DATA sXML_np__block_list[] = "_block-list"; /*N*/ : SvXMLImport( xServiceFactory ), /*N*/ rSectionList ( rNewSectionList ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 GetNamespaceMap().Add( OUString ( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__block_list ) ), +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 GetNamespaceMap().Add( OUString ( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__block_list ) ), //STRIP001 GetXMLToken ( XML_N_BLOCK_LIST), //STRIP001 XML_NAMESPACE_BLOCKLIST ); /*N*/ } diff --git a/binfilter/bf_sw/source/core/text/inftxt.hxx b/binfilter/bf_sw/source/core/text/inftxt.hxx index bbd8b7f41..1ae1f242f 100644 --- a/binfilter/bf_sw/source/core/text/inftxt.hxx +++ b/binfilter/bf_sw/source/core/text/inftxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: inftxt.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:09 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -898,19 +898,19 @@ inline void SwTxtPaintInfo::DrawText( const XubString &rText, const xub_StrLen nStart, const xub_StrLen nLen, const sal_Bool bKern ) const { - DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwTxtPaintInfo*)this)->_DrawText( rText, rPor, nStart, nLen, bKern ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwTxtPaintInfo*)this)->_DrawText( rText, rPor, nStart, nLen, bKern ); } inline void SwTxtPaintInfo::DrawText( const SwLinePortion &rPor, const xub_StrLen nLen, const sal_Bool bKern ) const { - DBG_ASSERT(0, "STRIP"); //STRIP001((SwTxtPaintInfo*)this)->_DrawText( *pTxt, rPor, nIdx, nLen, bKern ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001((SwTxtPaintInfo*)this)->_DrawText( *pTxt, rPor, nIdx, nLen, bKern ); } inline void SwTxtPaintInfo::DrawWrongText( const SwLinePortion &rPor, const xub_StrLen nLen, const sal_Bool bKern ) const { - DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwTxtPaintInfo*)this)->_DrawText( *pTxt, rPor, nIdx, nLen, bKern, sal_True ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwTxtPaintInfo*)this)->_DrawText( *pTxt, rPor, nIdx, nLen, bKern, sal_True ); } /************************************************************************* diff --git a/binfilter/bf_sw/source/core/text/itrtxt.hxx b/binfilter/bf_sw/source/core/text/itrtxt.hxx index 5006b85de..34bb5f564 100644 --- a/binfilter/bf_sw/source/core/text/itrtxt.hxx +++ b/binfilter/bf_sw/source/core/text/itrtxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: itrtxt.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:10 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -310,7 +310,7 @@ public: sal_Bool GetCharRect(SwRect *, const xub_StrLen, SwCrsrMoveState* = 0, const long nMax = 0 ); sal_Bool GetEndCharRect(SwRect *, const xub_StrLen, SwCrsrMoveState* = 0,//STRIP001 sal_Bool GetEndCharRect(SwRect *, const xub_StrLen, SwCrsrMoveState* = 0, - const long nMax = 0 ){DBG_ASSERT(0, "STRIP"); return FALSE;} ;//STRIP001 const long nMax = 0 ); + const long nMax = 0 ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;} ;//STRIP001 const long nMax = 0 ); xub_StrLen GetCrsrOfst( SwPosition *pPos, const Point &rPoint, const MSHORT nChgNode, const SwCrsrMoveState* = 0 ) const; // 1170: beruecksichtigt Mehrdeutigkeiten; Implementierung s.u. diff --git a/binfilter/bf_sw/source/core/text/porexp.hxx b/binfilter/bf_sw/source/core/text/porexp.hxx index 253c32d5c..242450ea5 100644 --- a/binfilter/bf_sw/source/core/text/porexp.hxx +++ b/binfilter/bf_sw/source/core/text/porexp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: porexp.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:10 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,7 +125,7 @@ class SwPostItsPortion : public SwExpandPortion //STRIP001 KSHORT nViewWidth; //STRIP001 sal_Bool bScript; public: - SwPostItsPortion( sal_Bool bScrpt ){DBG_ASSERT(0, "STRIP");}; //STRIP001 //STRIP001 SwPostItsPortion( sal_Bool bScrpt ); + SwPostItsPortion( sal_Bool bScrpt ){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 //STRIP001 SwPostItsPortion( sal_Bool bScrpt ); //STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; //STRIP001 virtual sal_Bool Format( SwTxtFormatInfo &rInf ); //STRIP001 virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; diff --git a/binfilter/bf_sw/source/core/text/porfld.hxx b/binfilter/bf_sw/source/core/text/porfld.hxx index c015b03a8..c96bfbc63 100644 --- a/binfilter/bf_sw/source/core/text/porfld.hxx +++ b/binfilter/bf_sw/source/core/text/porfld.hxx @@ -2,9 +2,9 @@ * * $RCSfile: porfld.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:10 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -214,13 +214,13 @@ class SwGrfNumPortion : public SwNumberPortion public: SwGrfNumPortion( SwFrm *pFrm, const SvxBrushItem* pGrfBrush,//STRIP001 SwGrfNumPortion( SwFrm *pFrm, const SvxBrushItem* pGrfBrush, const SwFmtVertOrient* pGrfOrient, const Size& rGrfSize,//STRIP001 const SwFmtVertOrient* pGrfOrient, const Size& rGrfSize, -const sal_Bool bLeft, const sal_Bool bCenter, const KSHORT nMinDst ):SwNumberPortion( aEmptyStr, NULL, bLeft, bCenter, nMinDst ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 const sal_Bool bLeft, const sal_Bool bCenter, const KSHORT nMinDst ); +const sal_Bool bLeft, const sal_Bool bCenter, const KSHORT nMinDst ):SwNumberPortion( aEmptyStr, NULL, bLeft, bCenter, nMinDst ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 const sal_Bool bLeft, const sal_Bool bCenter, const KSHORT nMinDst ); //STRIP001 ~SwGrfNumPortion(); //STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; //STRIP001 virtual sal_Bool Format( SwTxtFormatInfo &rInf ); //STRIP001 void SetBase( long nLnAscent, long nLnDescent,//STRIP001 void SetBase( long nLnAscent, long nLnDescent, -long nFlyAscent, long nFlyDescent ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 long nFlyAscent, long nFlyDescent ); +long nFlyAscent, long nFlyDescent ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 long nFlyAscent, long nFlyDescent ); //STRIP001 //STRIP001 void StopAnimation( OutputDevice *pOut ); //STRIP001 diff --git a/binfilter/bf_sw/source/core/text/porfly.hxx b/binfilter/bf_sw/source/core/text/porfly.hxx index a2c53f08f..80a7db3bc 100644 --- a/binfilter/bf_sw/source/core/text/porfly.hxx +++ b/binfilter/bf_sw/source/core/text/porfly.hxx @@ -2,9 +2,9 @@ * * $RCSfile: porfly.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:11 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,7 @@ public: : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); } inline const KSHORT GetBlankWidth( ) const { return nBlankWidth; } inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; } - virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_ASSERT(0, "STRIP");} //STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; virtual sal_Bool Format( SwTxtFormatInfo &rInf ); OUTPUT_OPERATOR }; @@ -136,7 +136,7 @@ public: //STRIP001 xub_StrLen GetFlyCrsrOfst( const KSHORT nOfst, const Point &rPoint, //STRIP001 SwPosition *pPos, const SwCrsrMoveState* pCMS ) const; virtual sal_Bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_ASSERT(0, "STRIP");} ;//STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; OUTPUT_OPERATOR }; diff --git a/binfilter/bf_sw/source/core/text/porftn.hxx b/binfilter/bf_sw/source/core/text/porftn.hxx index e22b17655..cd237a255 100644 --- a/binfilter/bf_sw/source/core/text/porftn.hxx +++ b/binfilter/bf_sw/source/core/text/porftn.hxx @@ -2,9 +2,9 @@ * * $RCSfile: porftn.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:11 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,7 @@ class SwQuoVadisPortion : public SwFldPortion { //STRIP001 XubString aErgo; public: - SwQuoVadisPortion( const XubString &rExp, const XubString& rStr ): SwFldPortion( rExp ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 SwQuoVadisPortion( const XubString &rExp, const XubString& rStr ); + SwQuoVadisPortion( const XubString &rExp, const XubString& rStr ): SwFldPortion( rExp ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 SwQuoVadisPortion( const XubString &rExp, const XubString& rStr ); //STRIP001 virtual sal_Bool Format( SwTxtFormatInfo &rInf ); //STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; //STRIP001 virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const; @@ -138,7 +138,7 @@ public: class SwErgoSumPortion : public SwFldPortion { public: -SwErgoSumPortion( const XubString &rExp, const XubString& rStr ):SwFldPortion( rExp ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 SwErgoSumPortion( const XubString &rExp, const XubString& rStr ); +SwErgoSumPortion( const XubString &rExp, const XubString& rStr ):SwFldPortion( rExp ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 SwErgoSumPortion( const XubString &rExp, const XubString& rStr ); //STRIP001 virtual xub_StrLen GetCrsrOfst( const KSHORT nOfst ) const; //STRIP001 virtual sal_Bool Format( SwTxtFormatInfo &rInf ); //STRIP001 diff --git a/binfilter/bf_sw/source/core/text/porglue.hxx b/binfilter/bf_sw/source/core/text/porglue.hxx index a1c02d1ce..72ba91325 100644 --- a/binfilter/bf_sw/source/core/text/porglue.hxx +++ b/binfilter/bf_sw/source/core/text/porglue.hxx @@ -2,9 +2,9 @@ * * $RCSfile: porglue.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,7 +91,7 @@ public: inline void MoveAllGlue( SwGluePortion *pTarget ); inline void MoveHalfGlue( SwGluePortion *pTarget ); inline void AdjFixWidth(); - virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_ASSERT(0, "STRIP");};//STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_BF_ASSERT(0, "STRIP");};//STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; //STRIP001 virtual xub_StrLen GetCrsrOfst( const KSHORT nOfst ) const; //STRIP001 virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const; //STRIP001 virtual sal_Bool GetExpTxt( const SwTxtSizeInfo &rInf, XubString &rTxt ) const; diff --git a/binfilter/bf_sw/source/core/text/pormulti.hxx b/binfilter/bf_sw/source/core/text/pormulti.hxx index 34f584a6b..7d5d40a3c 100644 --- a/binfilter/bf_sw/source/core/text/pormulti.hxx +++ b/binfilter/bf_sw/source/core/text/pormulti.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pormulti.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:13 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -175,14 +175,14 @@ public: //STRIP001 SwFldPortion* GetFldRest() { return pFldRest; } //STRIP001 void SetFldRest( SwFldPortion* pNew ) { pFldRest = pNew; } //STRIP001 - inline sal_Bool HasTabulator() const{DBG_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 inline sal_Bool HasTabulator() const { return bTab1 || bTab2; } + inline sal_Bool HasTabulator() const{DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 inline sal_Bool HasTabulator() const { return bTab1 || bTab2; } //STRIP001 inline sal_Bool IsFormatted() const { return bFormatted; } //STRIP001 inline void SetFormatted() { bFormatted = sal_True; } inline sal_Bool IsFollowFld() const { return bFollowFld; } //STRIP001 inline void SetFollowFld() { bFollowFld = sal_True; } inline sal_Bool HasFlyInCntnt() const { return bFlyInCntnt; } //STRIP001 inline void SetFlyInCntnt( sal_Bool bNew ) { bFlyInCntnt = bNew; } - inline sal_Bool IsDouble() const{DBG_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 inline sal_Bool IsDouble() const { return bDouble; } + inline sal_Bool IsDouble() const{DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 inline sal_Bool IsDouble() const { return bDouble; } //STRIP001 inline sal_Bool IsRuby() const { return bRuby; } #ifdef BIDI inline sal_Bool IsBidi() const { return bBidi; } diff --git a/binfilter/bf_sw/source/core/text/porref.hxx b/binfilter/bf_sw/source/core/text/porref.hxx index f0f1eb57d..3540c789b 100644 --- a/binfilter/bf_sw/source/core/text/porref.hxx +++ b/binfilter/bf_sw/source/core/text/porref.hxx @@ -2,9 +2,9 @@ * * $RCSfile: porref.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:13 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ class SwIsoRefPortion : public SwRefPortion //STRIP001 KSHORT nViewWidth; //STRIP001 public: - SwIsoRefPortion(){DBG_ASSERT(0, "STRIP");}; //STRIP001 //STRIP001 SwIsoRefPortion(); + SwIsoRefPortion(){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 //STRIP001 SwIsoRefPortion(); //STRIP001 virtual sal_Bool Format( SwTxtFormatInfo &rInf ); //STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; //STRIP001 virtual SwLinePortion *Compress(); diff --git a/binfilter/bf_sw/source/core/text/porrst.hxx b/binfilter/bf_sw/source/core/text/porrst.hxx index db010b90c..0f2d865e6 100644 --- a/binfilter/bf_sw/source/core/text/porrst.hxx +++ b/binfilter/bf_sw/source/core/text/porrst.hxx @@ -2,9 +2,9 @@ * * $RCSfile: porrst.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:13 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,7 +109,7 @@ public: SwBreakPortion( const SwLinePortion &rPortion ); // liefert 0 zurueck, wenn keine Nutzdaten enthalten sind. virtual SwLinePortion *Compress(); - virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_ASSERT(0, "STRIP");} ;//STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; virtual sal_Bool Format( SwTxtFormatInfo &rInf ); //STRIP001 virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const; USHORT GetRestWidth() const { return nRestWidth; } diff --git a/binfilter/bf_sw/source/core/text/portxt.hxx b/binfilter/bf_sw/source/core/text/portxt.hxx index 6002076d9..450f110c1 100644 --- a/binfilter/bf_sw/source/core/text/portxt.hxx +++ b/binfilter/bf_sw/source/core/text/portxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: portxt.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:14 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ class SwTxtPortion : public SwLinePortion public: inline SwTxtPortion(){ SetWhichPor( POR_TXT ); } SwTxtPortion( const SwLinePortion &rPortion ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_ASSERT(0, "STRIP");}; //STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; virtual sal_Bool Format( SwTxtFormatInfo &rInf ); virtual void FormatEOL( SwTxtFormatInfo &rInf ); //STRIP001 virtual xub_StrLen GetCrsrOfst( const KSHORT nOfst ) const; @@ -122,7 +122,7 @@ public: inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; } virtual SwLinePortion *Compress(); //STRIP001 virtual sal_Bool Format( SwTxtFormatInfo &rInf ); - virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_ASSERT(0, "STRIP");} ;//STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; + virtual void Paint( const SwTxtPaintInfo &rInf ) const{DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 virtual void Paint( const SwTxtPaintInfo &rInf ) const; // Accessibility: pass information about this portion to the PortionHandler //STRIP001 virtual void HandlePortion( SwPortionHandler& rPH ) const; diff --git a/binfilter/bf_sw/source/core/text/redlnitr.hxx b/binfilter/bf_sw/source/core/text/redlnitr.hxx index 2a6d33919..5e19b4eb2 100644 --- a/binfilter/bf_sw/source/core/text/redlnitr.hxx +++ b/binfilter/bf_sw/source/core/text/redlnitr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: redlnitr.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:15 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ class SwRedlineItr public: SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt, SwAttrHandler& rAH,//STRIP001 SwRedlineItr( const SwTxtNode& rTxtNd, SwFont& rFnt, SwAttrHandler& rAH, xub_StrLen nRedlPos, sal_Bool bShw, const SvUShorts *pArr = 0,//STRIP001 xub_StrLen nRedlPos, sal_Bool bShw, const SvUShorts *pArr = 0, -xub_StrLen nStart = STRING_LEN ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 xub_StrLen nStart = STRING_LEN ); +xub_StrLen nStart = STRING_LEN ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 xub_StrLen nStart = STRING_LEN ); //STRIP001 ~SwRedlineItr(); inline sal_Bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); } //STRIP001 inline void Clear( SwFont* pFnt ) { if( bOn ) _Clear( pFnt ); } @@ -142,7 +142,7 @@ xub_StrLen nStart = STRING_LEN ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 xub //STRIP001 { if( bShow || pExt ) return _GetNextRedln( nNext ); return nNext; } //STRIP001 inline sal_Bool ChkSpecialUnderline() const //STRIP001 { if ( IsOn() ) return _ChkSpecialUnderline(); return sal_False; } - sal_Bool CheckLine( xub_StrLen nChkStart, xub_StrLen nChkEnd ){DBG_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 sal_Bool CheckLine( xub_StrLen nChkStart, xub_StrLen nChkEnd ); + sal_Bool CheckLine( xub_StrLen nChkStart, xub_StrLen nChkEnd ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;} //STRIP001 sal_Bool CheckLine( xub_StrLen nChkStart, xub_StrLen nChkEnd ); //STRIP001 inline sal_Bool LeaveExtend( SwFont& rFnt, xub_StrLen nNew ) //STRIP001 { return pExt->Leave(rFnt, nNew ); } inline sal_Bool ExtOn() { if( pExt ) return pExt->IsOn(); return sal_False; } diff --git a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx index c93ff7e62..d0c9b8eaf 100644 --- a/binfilter/bf_sw/source/core/text/sw_atrstck.cxx +++ b/binfilter/bf_sw/source/core/text/sw_atrstck.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_atrstck.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:15 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -486,7 +486,7 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = { /*M*/ { /*M*/ // we let pItem change rFnt /*M*/ if ( lcl_ChgHyperLinkColor( rAttr, *pItem, pShell ) ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*M*/ // for hyperlinks we still have to evaluate /*M*/ // the appearence settings //STRIP001 /*?*/ Color aColor; @@ -641,7 +641,7 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = { /*M*/ { /*M*/ // for hyperlinks we still have to evaluate /*M*/ // the appearence settings -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Color aColor; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Color aColor; //STRIP001 /*?*/ if ( ((SwTxtINetFmt*)pTopAt)->IsVisited() ) //STRIP001 /*?*/ aColor = SwViewOption::GetVisitedLinksColor(); //STRIP001 /*?*/ else @@ -669,7 +669,7 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = { /*M*/ { /*M*/ // ruby stack has no more attributes /*M*/ // check, if an rotation attribute has to be applied -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nTwoLineStack = StackPos[ RES_CHRATR_TWO_LINES ]; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nTwoLineStack = StackPos[ RES_CHRATR_TWO_LINES ]; //STRIP001 /*?*/ sal_Bool bTwoLineAct = sal_False; //STRIP001 /*?*/ const SfxPoolItem* pTwoLineItem = 0; //STRIP001 /*?*/ const SwTxtAttr* pTwoLineAttr = aAttrStack[ nTwoLineStack ].Top(); @@ -847,7 +847,7 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = { /*M*/ /*M*/ if ( pTwoLineAttr ) /*M*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pTwoLineItem = lcl_GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pTwoLineItem = lcl_GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES ); /*?*/ bTwoLineAct = ((SvxTwoLinesItem*)pTwoLineItem)->GetValue(); /*M*/ } /*M*/ else @@ -888,7 +888,7 @@ const BYTE StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] = { /*M*/ /*M*/ if ( pRotateAttr ) /*M*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pRotateItem = lcl_GetItem( *pRotateAttr, RES_CHRATR_ROTATE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pRotateItem = lcl_GetItem( *pRotateAttr, RES_CHRATR_ROTATE ); //STRIP001 /*?*/ rFnt.SetVertical( ((SvxCharRotateItem*)pRotateItem)->GetValue(), //STRIP001 /*M*/ bVertLayout ); /*M*/ } diff --git a/binfilter/bf_sw/source/core/text/sw_blink.cxx b/binfilter/bf_sw/source/core/text/sw_blink.cxx index 0118908b8..c1a171ace 100644 --- a/binfilter/bf_sw/source/core/text/sw_blink.cxx +++ b/binfilter/bf_sw/source/core/text/sw_blink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_blink.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:15 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,7 +92,7 @@ namespace binfilter { //STRIP001 SV_IMPL_OP_PTRARR_SORT( SwBlinkList, SwBlinkPortionPtr ) /*N*/ SwBlink::SwBlink() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 bVisible = sal_True; //STRIP001 // Den Timer vorbereiten //STRIP001 aTimer.SetTimeout( BLINK_ON_TIME ); diff --git a/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx b/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx index 58e22e3ac..463d97076 100644 --- a/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx +++ b/binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_frmcrsr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:16 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -135,7 +135,7 @@ namespace binfilter { /*N*/ if( nOffset < pFrmAtPos->GetOfst() && /*N*/ !pFrmAtPos->IsFollow() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ xub_StrLen nNew = nOffset; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ xub_StrLen nNew = nOffset; //STRIP001 /*?*/ if( nNew < MIN_OFFSET_STEP ) //STRIP001 /*?*/ nNew = 0; //STRIP001 /*?*/ else @@ -317,7 +317,7 @@ namespace binfilter { /*N*/ /*N*/ #ifdef BIDI /*N*/ if ( pFrm->IsRightToLeft() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( rOrig ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( rOrig ); /*N*/ #endif /*N*/ /*N*/ bRet = sal_True; @@ -329,7 +329,7 @@ namespace binfilter { /*N*/ /*N*/ SwFrmSwapper aSwapper( pFrm, sal_True ); /*N*/ if ( bVert ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nMaxY = pFrm->SwitchVerticalToHorizontal( nMaxY ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nMaxY = pFrm->SwitchVerticalToHorizontal( nMaxY ); /*N*/ /*N*/ sal_Bool bGoOn = sal_True; /*N*/ xub_StrLen nOffset = rPos.nContent.GetIndex(); @@ -349,17 +349,17 @@ namespace binfilter { /*N*/ /*N*/ #ifdef BIDI /*N*/ if ( pFrm->IsRightToLeft() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( rOrig ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( rOrig ); /*N*/ #endif /*N*/ if ( bVert ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchHorizontalToVertical( rOrig ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchHorizontalToVertical( rOrig ); /*N*/ /*N*/ if( pFrm->IsUndersized() && pCMS && !pFrm->GetNext() && /*N*/ (rOrig.*fnRect->fnGetBottom)() == nUpperMaxY && /*N*/ pFrm->GetOfst() < nOffset && /*N*/ !pFrm->IsFollow() && !bNoScroll && /*N*/ pFrm->GetTxtNode()->GetTxt().Len() != nNextOfst ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ bGoOn = lcl_ChangeOffset( pFrm, nNextOfst ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ bGoOn = lcl_ChangeOffset( pFrm, nNextOfst ); /*N*/ else /*N*/ bGoOn = sal_False; /*N*/ } while ( bGoOn ); @@ -369,7 +369,7 @@ namespace binfilter { /*N*/ #ifdef BIDI /*N*/ if ( pFrm->IsRightToLeft() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( pCMS->b2Lines && pCMS->p2Lines) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( pCMS->b2Lines && pCMS->p2Lines) //STRIP001 /*?*/ { //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( pCMS->p2Lines->aLine ); //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( pCMS->p2Lines->aPortion ); @@ -392,7 +392,7 @@ namespace binfilter { /*?*/ } /*?*/ if( pCMS->b2Lines && pCMS->p2Lines) /*?*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pFrm->SwitchHorizontalToVertical( pCMS->p2Lines->aLine ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pFrm->SwitchHorizontalToVertical( pCMS->p2Lines->aLine ); //STRIP001 /*?*/ pFrm->SwitchHorizontalToVertical( pCMS->p2Lines->aPortion ); /*?*/ } /*N*/ } @@ -475,7 +475,7 @@ namespace binfilter { /*N*/ return sal_True; /*N*/ } /*N*/ else -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( !pFrm->HasPara() ) //STRIP001 /*?*/ return sal_False; //STRIP001 /*?*/ @@ -558,14 +558,14 @@ struct SwFillData /*N*/ Point aOldPoint( rPoint ); /*N*/ /*N*/ if ( IsVertical() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwitchVerticalToHorizontal( (Point&)rPoint ); //STRIP001 /*?*/ ((SwTxtFrm*)this)->SwapWidthAndHeight(); /*N*/ } /*N*/ /*N*/ #ifdef BIDI /*N*/ if ( IsRightToLeft() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 SwitchRTLtoLTR( (Point&)rPoint ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 SwitchRTLtoLTR( (Point&)rPoint ); /*N*/ #endif /*N*/ /*N*/ SwFillData *pFillData = ( pCMS && pCMS->pFill ) ? @@ -649,7 +649,7 @@ struct SwFillData /*N*/ } /*N*/ sal_Bool bChgFillData = sal_False; /*N*/ if( pFillData && FindPageFrm()->Frm().IsInside( aOldPoint ) ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ FillCrsrPos( *pFillData ); //STRIP001 /*?*/ bChgFillData = sal_True; /*N*/ } @@ -662,7 +662,7 @@ struct SwFillData /*N*/ } /*N*/ /*N*/ if ( IsRightToLeft() && bChgFillData ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwitchLTRtoRTL( pFillData->Fill().aCrsr.Pos() ); //STRIP001 /*?*/ const SwHoriOrient eOrient = pFillData->pCMS->pFill->eOrient; //STRIP001 /*?*/ diff --git a/binfilter/bf_sw/source/core/text/sw_frmform.cxx b/binfilter/bf_sw/source/core/text/sw_frmform.cxx index 7d6863f9f..14929e462 100644 --- a/binfilter/bf_sw/source/core/text/sw_frmform.cxx +++ b/binfilter/bf_sw/source/core/text/sw_frmform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_frmform.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:16 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -744,7 +744,7 @@ MSHORT FormatLevel::nLevel = 0; /*?*/ const SwTxtAttr *pHt = (*pHints)[i]; /*?*/ if( RES_TXTATR_FTN==pHt->Which() && *pHt->GetStart()>=nStart ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pHt->GetFtn().IsEndNote() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pHt->GetFtn().IsEndNote() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ if( !pEndBoss ) //STRIP001 /*?*/ pEndBoss = pFoll->FindFtnBossFrm(); @@ -812,7 +812,7 @@ MSHORT FormatLevel::nLevel = 0; /*?*/ const SwTxtAttr *pHt = (*pHints)[i]; /*?*/ if( RES_TXTATR_FTN==pHt->Which() && *pHt->GetStart()>=nTxtPos ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pHt->GetFtn().IsEndNote() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pHt->GetFtn().IsEndNote() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ if( !pEndBoss ) //STRIP001 /*?*/ pEndBoss = FindFtnBossFrm(); @@ -956,7 +956,7 @@ MSHORT FormatLevel::nLevel = 0; /*?*/ /*?*/ if ( bVert ) /*?*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SwRect aRepaint( Frm().Pos() + Prt().Pos(), Prt().SSize() ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SwRect aRepaint( Frm().Pos() + Prt().Pos(), Prt().SSize() ); //STRIP001 /*?*/ SwitchVerticalToHorizontal( aRepaint ); //STRIP001 /*?*/ rRepaint.Chg( aRepaint.Pos(), aRepaint.SSize() ); /*?*/ } @@ -1190,7 +1190,7 @@ MSHORT FormatLevel::nLevel = 0; /*N*/ nBodyHeight < ( IsVertical() ? /*N*/ pBodyFrm->Frm().Width() : /*N*/ pBodyFrm->Frm().Height() ) ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ rLine.MakeDummyLine(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ rLine.MakeDummyLine(); /*N*/ } /*N*/ /*N*/ // In AdjustFrm() stellen wir uns selbst per Grow/Shrink ein, @@ -1830,7 +1830,7 @@ MSHORT FormatLevel::nLevel = 0; /*N*/ pPara->Truncate(); /*N*/ pPara->FormatReset(); /*N*/ if( pBlink && pPara->IsBlinking() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( pPara ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( pPara ); /*N*/ /*N*/ // delete pSpaceAdd und pKanaComp /*N*/ pPara->FinishSpaceAdd(); @@ -1862,7 +1862,7 @@ MSHORT FormatLevel::nLevel = 0; /*N*/ if( SVX_ADJUST_LEFT != aLine.GetAdjust() && /*N*/ SVX_ADJUST_BLOCK != aLine.GetAdjust() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aLine.CalcDropAdjust(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ aLine.CalcDropAdjust(); //STRIP001 /*?*/ aLine.SetPaintDrop( sal_True ); /*N*/ } /*N*/ @@ -2097,7 +2097,7 @@ MSHORT FormatLevel::nLevel = 0; /*M*/ { /*M*/ SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm(); /*M*/ if( pFly->IsAutoPos() && !::binfilter::IsInProgress( pFly ) ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ ++nAutoCnt; //STRIP001 /*?*/ ASSERT( pFly->IsFlyAtCntFrm(), "Not at content, but autopos.?" ); //STRIP001 /*?*/ ((SwFlyAtCntFrm*)pFly)->CheckCharRect(); @@ -2258,7 +2258,7 @@ MSHORT FormatLevel::nLevel = 0; /*N*/ { DBG_LOOP; /*N*/ nStart = aLine.FormatLine( nStart ); /*N*/ if( aInf.IsNewLine() || (!aInf.IsStop() && nStart < nEnd) ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ aLine.Insert( new SwLineLayout() ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ aLine.Insert( new SwLineLayout() ); /*N*/ } while( aLine.Next() ); /*N*/ /*N*/ // Last exit: die Hoehen muessen uebereinstimmen. diff --git a/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx b/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx index dc4301960..dcca1d693 100644 --- a/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx +++ b/binfilter/bf_sw/source/core/text/sw_frmpaint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_frmpaint.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -538,7 +538,7 @@ sal_Bool bInitFont = sal_True; /*N*/ /*N*/ #ifdef BIDI /*N*/ if ( IsRightToLeft() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ SwitchLTRtoRTL( aRet ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ SwitchLTRtoRTL( aRet ); /*N*/ #endif /*N*/ if ( IsVertical() ) /*N*/ SwitchHorizontalToVertical( aRet ); diff --git a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx index 5cfcd6601..8c36beff6 100644 --- a/binfilter/bf_sw/source/core/text/sw_inftxt.cxx +++ b/binfilter/bf_sw/source/core/text/sw_inftxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_inftxt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1502,7 +1502,7 @@ extern Color aGlobalRetoucheColor; /*N*/ /*N*/ uno::Reference< XHyphenator > xHyph = ::binfilter::GetHyphenator(); /*N*/ if (bInterHyph && xHyph.is()) -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SvxSpellWrapper::CheckHyphLang( xHyph, eTmp ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SvxSpellWrapper::CheckHyphLang( xHyph, eTmp ); /*N*/ /*N*/ if( !xHyph.is() || !xHyph->hasLocale( pBreakIt->GetLocale(eTmp) ) ) /*N*/ return sal_False; diff --git a/binfilter/bf_sw/source/core/text/sw_itradj.cxx b/binfilter/bf_sw/source/core/text/sw_itradj.cxx index e1137dd34..1be0510ae 100644 --- a/binfilter/bf_sw/source/core/text/sw_itradj.cxx +++ b/binfilter/bf_sw/source/core/text/sw_itradj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_itradj.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:23:02 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,7 +201,7 @@ namespace binfilter { /*N*/ if ( pPos->InTxtGrp() ) /*N*/ nGluePortion += ((SwTxtPortion*)pPos)->GetSpaceCnt( GetInfo(), nCharCnt ); /*N*/ else if( pPos->IsMultiPortion() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { //STRIP001 /*?*/ SwMultiPortion* pMulti = (SwMultiPortion*)pPos; //STRIP001 /*?*/ // a multiportion with a tabulator inside breaks the text adjustment //STRIP001 /*?*/ // a ruby portion will not be stretched by text adjustment @@ -629,7 +629,7 @@ namespace binfilter { /*N*/ /*N*/ SwRect aLineVert( rCurrRect ); /*N*/ if ( GetTxtFrm()->IsRightToLeft() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 GetTxtFrm()->SwitchLTRtoRTL( aLineVert ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 GetTxtFrm()->SwitchLTRtoRTL( aLineVert ); /*N*/ if ( GetTxtFrm()->IsVertical() ) /*?*/ GetTxtFrm()->SwitchHorizontalToVertical( aLineVert ); /*N*/ @@ -637,9 +637,9 @@ namespace binfilter { /*N*/ SwRect aFlyRect( aTxtFly.GetFrm( aLineVert ) ); /*N*/ /*N*/ if ( GetTxtFrm()->IsRightToLeft() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 GetTxtFrm()->SwitchRTLtoLTR( aFlyRect ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 GetTxtFrm()->SwitchRTLtoLTR( aFlyRect ); /*N*/ if ( GetTxtFrm()->IsVertical() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 GetTxtFrm()->SwitchVerticalToHorizontal( aFlyRect ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 GetTxtFrm()->SwitchVerticalToHorizontal( aFlyRect ); /*N*/ /*N*/ // Wenn ein Frame ueberlappt, wird eine Portion eroeffnet. /*N*/ if( aFlyRect.HasArea() ) diff --git a/binfilter/bf_sw/source/core/text/sw_itratr.cxx b/binfilter/bf_sw/source/core/text/sw_itratr.cxx index 43e3d1632..d0fda8bec 100644 --- a/binfilter/bf_sw/source/core/text/sw_itratr.cxx +++ b/binfilter/bf_sw/source/core/text/sw_itratr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_itratr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:18 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -186,7 +186,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ { /*N*/ ASSERT( pHt && pFnt, "No attribute of font available for change"); /*N*/ if( pRedln && pRedln->IsOn() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->ChangeTxtAttr( pFnt, *pHt, sal_True ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->ChangeTxtAttr( pFnt, *pHt, sal_True ); /*N*/ else /*N*/ aAttrHandler.PushAndChg( *pHt, *pFnt ); /*N*/ nChgCnt++; @@ -201,7 +201,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ ASSERT( pHt && pFnt, "No attribute of font available for reset"); /*N*/ // get top from stack after removing pHt /*N*/ if( pRedln && pRedln->IsOn() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->ChangeTxtAttr( pFnt, *pHt, sal_False ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->ChangeTxtAttr( pFnt, *pHt, sal_False ); /*N*/ else /*N*/ aAttrHandler.PopAndChg( *pHt, *pFnt ); /*N*/ nChgCnt--; @@ -290,7 +290,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ sal_Bool SwAttrIter::SeekStartAndChg( OutputDevice *pOut, const sal_Bool bParaFont ) /*N*/ { /*N*/ if ( pRedln && pRedln->ExtOn() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->LeaveExtend( *pFnt, 0 ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->LeaveExtend( *pFnt, 0 ); /*N*/ /*N*/ // reset font to its original state /*N*/ aAttrHandler.Reset(); @@ -301,7 +301,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*?*/ pFnt->SetProportion( nPropFont ); /*N*/ if( pRedln ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pRedln->Clear( pFnt ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pRedln->Clear( pFnt ); //STRIP001 /*?*/ if( !bParaFont ) //STRIP001 /*?*/ nChgCnt += pRedln->Seek( *pFnt, 0, STRING_LEN ); //STRIP001 /*?*/ else @@ -393,14 +393,14 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ sal_Bool SwAttrIter::Seek( const xub_StrLen nNewPos ) /*N*/ { /*N*/ if ( pRedln && pRedln->ExtOn() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->LeaveExtend( *pFnt, nNewPos ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->LeaveExtend( *pFnt, nNewPos ); /*N*/ /*N*/ if( pHints ) /*N*/ { /*N*/ if( !nNewPos || nNewPos < nPos ) /*N*/ { /*N*/ if( pRedln ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->Clear( NULL ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRedln->Clear( NULL ); /*N*/ /*N*/ // reset font to its original state /*N*/ aAttrHandler.Reset(); @@ -416,7 +416,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ // changes for extended input directly to the font /*N*/ if ( pRedln && pRedln->ExtOn() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pRedln->UpdateExtFont( *pFnt ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pRedln->UpdateExtFont( *pFnt ); //STRIP001 /*?*/ ++nChgCnt; /*N*/ } /*N*/ } @@ -426,7 +426,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ pFnt->SetActual( WhichFont( nNewPos, 0, pScriptInfo ) ); /*N*/ /*N*/ if( pRedln ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nChgCnt += pRedln->Seek( *pFnt, nNewPos, nPos ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nChgCnt += pRedln->Seek( *pFnt, nNewPos, nPos ); /*N*/ nPos = nNewPos; /*N*/ /*N*/ if( nPropFont ) @@ -453,7 +453,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ } /*N*/ } /*N*/ if( pRedln ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ return pRedln->GetNextRedln( nNext ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ return pRedln->GetNextRedln( nNext ); /*N*/ return nNext; /*N*/ } diff --git a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx index 1d806262d..e2b0f5f6d 100644 --- a/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx +++ b/binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_itrcrsr.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:23:02 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -533,7 +533,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; /*N*/ { /*N*/ nX += pPor->Width(); /*N*/ if ( pPor->InSpaceGrp() && nSpaceAdd ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nX += pPor->CalcSpacing( nSpaceAdd, aInf ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nX += pPor->CalcSpacing( nSpaceAdd, aInf ); /*N*/ if( bNoTxt ) /*N*/ nFirst = nX; /*N*/ // 8670: EndPortions zaehlen hier einmal als TxtPortions. @@ -616,7 +616,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; /*N*/ if ( aInf.GetIdx() + pPor->GetLen() < nOfst + nExtra ) /*N*/ { /*N*/ if ( pPor->InSpaceGrp() && nSpaceAdd ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*N*/ nX += pPor->PrtWidth() + + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*N*/ nX += pPor->PrtWidth() + //STRIP001 /*?*/ pPor->CalcSpacing( nSpaceAdd, aInf ); /*N*/ else /*N*/ { @@ -672,7 +672,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; /*N*/ { /*N*/ if( pPor->IsMultiPortion() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ #ifdef VERTICAL_LAYOUT + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ #ifdef VERTICAL_LAYOUT //STRIP001 /*?*/ nTmpAscent = AdjustBaseLine( *pCurr, pPor ); //STRIP001 /*?*/ GetInfo().SetMulti( sal_True ); //STRIP001 /*?*/ #else @@ -784,7 +784,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; //STRIP001 /*?*/ SwLayoutModeModifier aLayoutModeModifier( *GetInfo().GetOut() ); //STRIP001 /*?*/ if ( ((SwMultiPortion*)pPor)->IsBidi() ) //STRIP001 /*?*/ { -//STRIP001 {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ aLayoutModeModifier.Modify( +//STRIP001 {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ aLayoutModeModifier.Modify( //STRIP001 //STRIP001 /*?*/ ((SwBidiPortion*)pPor)->GetLevel() % 2 ); //STRIP001 /*?*/ } //STRIP001 /*?*/ #endif @@ -1096,7 +1096,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; /*N*/ if ( pCMS->pSpecialPos ) /*N*/ { /*N*/ // apply attributes to font - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ Seek( nOfst ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ Seek( nOfst ); //STRIP001 /*?*/ lcl_GetPositionInsideField( aInf, *pOrig, *pCMS, *pPor ); /*N*/ } /*N*/ } @@ -1359,7 +1359,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; /*N*/ /*N*/ KSHORT nWidth30; /*N*/ if ( pPor->IsPostItsPortion() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nWidth30 = 30 + pPor->GetViewWidth( GetInfo() ) / 2; + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nWidth30 = 30 + pPor->GetViewWidth( GetInfo() ) / 2; /*N*/ else /*N*/ nWidth30 = ! nWidth && pPor->GetLen() && pPor->InToxRefOrFldGrp() ? /*N*/ 30 : @@ -1404,7 +1404,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; /*?*/ } /*?*/ /*?*/ if ( pPor->IsPostItsPortion() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nWidth30 = 30 + pPor->GetViewWidth( GetInfo() ) / 2; + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nWidth30 = 30 + pPor->GetViewWidth( GetInfo() ) / 2; /*?*/ else /*?*/ nWidth30 = ! nWidth && pPor->GetLen() && pPor->InToxRefOrFldGrp() ? /*?*/ 30 : @@ -1533,7 +1533,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; /*N*/ { /*N*/ if( pPor->IsMultiPortion() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ // In a multi-portion we use GetCrsrOfst()-function recursively + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ // In a multi-portion we use GetCrsrOfst()-function recursively //STRIP001 /*?*/ SwTwips nTmpY = rPoint.Y() - pCurr->GetAscent() + pPor->GetAscent(); //STRIP001 /*?*/ // if we are in the first line of a double line portion, we have //STRIP001 /*?*/ // to add a value to nTmpY for not staying in this line @@ -1644,7 +1644,7 @@ sal_Bool SwTxtCursor::bRightMargin = sal_False; /*N*/ { /*N*/ if( nChgNode && pPos && pPor->IsFlyCntPortion() /*N*/ && !( (SwFlyCntPortion*)pPor )->IsDraw() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { //STRIP001 /*?*/ // JP 24.11.94: liegt die Pos nicht im Fly, dann //STRIP001 /*?*/ // darf nicht mit STRING_LEN returnt werden! //STRIP001 /*?*/ // (BugId: 9692 + Aenderung in feshview) diff --git a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx index cdab018e9..3d18fa655 100644 --- a/binfilter/bf_sw/source/core/text/sw_itrform2.cxx +++ b/binfilter/bf_sw/source/core/text/sw_itrform2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_itrform2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:19 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -360,7 +360,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*?*/ while( pTmp ) /*?*/ { /*?*/ if( pTmp->IsFtnPortion() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwFtnPortion*)pTmp)->ClearFtn(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwFtnPortion*)pTmp)->ClearFtn(); /*?*/ pTmp = pTmp->GetPortion(); /*?*/ } /*N*/ } @@ -614,7 +614,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*N*/ { /*?*/ // insert a grid kerning portion /*?*/ if ( ! pGridKernPortion ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pGridKernPortion = pPor->IsKernPortion() ? + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pGridKernPortion = pPor->IsKernPortion() ? //STRIP001 /*?*/ (SwKernPortion*)pPor : //STRIP001 /*?*/ new SwKernPortion( *pCurr ); /*?*/ @@ -631,7 +631,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*?*/ SwTwips nStartX = rInf.X() + GetLeftMargin(); /*?*/ if ( bVert ) /*?*/ { - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ Point aPoint( nStartX, 0 ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ Point aPoint( nStartX, 0 ); //STRIP001 /*?*/ pFrm->SwitchHorizontalToVertical( aPoint ); //STRIP001 /*?*/ nStartX = aPoint.Y(); /*?*/ } @@ -655,7 +655,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*N*/ /*N*/ // the multi-portion has it's own format function /*N*/ if( pPor->IsMultiPortion() && ( !pMulti || pMulti->IsBidi() ) ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ bFull = BuildMultiPortion( rInf, *((SwMultiPortion*)pPor) ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ bFull = BuildMultiPortion( rInf, *((SwMultiPortion*)pPor) ); /*N*/ else /*N*/ bFull = pPor->Format( rInf ); /*N*/ @@ -1083,7 +1083,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*M*/ { /*M*/ GETGRID( GetTxtFrm()->FindPageFrm() ) /*M*/ if ( pGrid ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pPor = new SwKernPortion( *pCurr ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pPor = new SwKernPortion( *pCurr ); /*M*/ } /*M*/ /*M*/ // 2) Die Zeilenreste (mehrzeilige Felder) @@ -1142,7 +1142,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*M*/ { /*M*/ GETGRID( GetTxtFrm()->FindPageFrm() ) /*M*/ if ( pGrid ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pPor = new SwKernPortion( *pCurr ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pPor = new SwKernPortion( *pCurr ); /*M*/ } /*M*/ } /*M*/ return pPor; @@ -1254,7 +1254,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*M*/ xub_StrLen nEnd = rInf.GetIdx(); /*M*/ SwMultiCreator* pCreate = rInf.GetMultiCreator( nEnd, pMulti ); /*M*/ if( pCreate ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwMultiPortion* pTmp = NULL; //STRIP001 /*?*/ //STRIP001 /*?*/ if ( SW_MC_BIDI == pCreate->nId ) @@ -1405,7 +1405,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*M*/ /*M*/ if ( 0 != nDir ) /*M*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete pPor; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete pPor; //STRIP001 /*?*/ pPor = new SwRotatedPortion( rInf.GetIdx() + 1, 900 == nDir ? //STRIP001 /*?*/ DIR_BOTTOM2TOP : //STRIP001 /*?*/ DIR_TOP2BOTTOM ); @@ -1421,7 +1421,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*N*/ USHORT nDir = pNumFnt->GetOrientation( rInf.GetTxtFrm()->IsVertical() ); /*M*/ if ( 0 != nDir ) /*M*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete pPor; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete pPor; //STRIP001 /*?*/ pPor = new SwRotatedPortion( 0, 900 == nDir ? //STRIP001 /*?*/ DIR_BOTTOM2TOP : //STRIP001 /*?*/ DIR_TOP2BOTTOM ); @@ -1543,7 +1543,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*M*/ /*M*/ if( GetInfo().IsStop() ) /*M*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pCurr->SetLen( 0 ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pCurr->SetLen( 0 ); //STRIP001 /*?*/ pCurr->Height( GetFrmRstHeight() + 1 ); //STRIP001 /*?*/ pCurr->SetRealHeight( GetFrmRstHeight() + 1 ); //STRIP001 /*?*/ pCurr->Width(0); @@ -1630,7 +1630,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*M*/ /*M*/ if ( GetInfo().CompressLine() ) /*M*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nRepaintOfst = CalcKanaAdj( pCurr ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nRepaintOfst = CalcKanaAdj( pCurr ); //STRIP001 /*?*/ //STRIP001 /*?*/ // adjust repaint offset //STRIP001 /*?*/ if ( nRepaintOfst < GetInfo().GetPaintOfst() ) @@ -1789,7 +1789,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*N*/ SwTwips nTmpY = Y() + pCurr->GetAscent() + nLineHeight - pCurr->Height(); /*N*/ SWRECTFN( pFrm ) /*N*/ if ( bVert ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nTmpY = pFrm->SwitchHorizontalToVertical( nTmpY ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nTmpY = pFrm->SwitchHorizontalToVertical( nTmpY ); /*N*/ nTmpY = (*fnRect->fnYDiff)( nTmpY, RegStart() ); /*N*/ KSHORT nDiff = KSHORT( nTmpY % RegDiff() ); /*N*/ if( nDiff ) @@ -1820,7 +1820,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*N*/ rInf.Width( rInf.RealWidth() ); /*N*/ if( ((SwTxtFormatter*)this)->GetRedln() ) /*N*/ { - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwTxtFormatter*)this)->GetRedln()->Clear( ((SwTxtFormatter*)this)->GetFnt() ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwTxtFormatter*)this)->GetRedln()->Clear( ((SwTxtFormatter*)this)->GetFnt() ); //STRIP001 /*?*/ ((SwTxtFormatter*)this)->GetRedln()->Reset(); /*N*/ } /*N*/ } @@ -1834,7 +1834,7 @@ extern sal_Bool IsUnderlineBreak( const SwLinePortion& rPor, const SwFont& rFnt /*N*/ pCurr->Truncate(); /*N*/ pCurr->Init(); /*N*/ if( pBlink && pCurr->IsBlinking() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( pCurr ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( pCurr ); /*N*/ /*N*/ // delete pSpaceAdd und pKanaComp /*N*/ pCurr->FinishSpaceAdd(); diff --git a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx index a36bf00c7..fc75a9a17 100644 --- a/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx +++ b/binfilter/bf_sw/source/core/text/sw_itrtxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_itrtxt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:20 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -387,7 +387,7 @@ namespace binfilter { /*?*/ // we center the portion in its surrounding line /*?*/ nOfst = ( pCurr->Height() - nPorHeight ) / 2 + nPorAscent; /*?*/ else - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ { + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ { //STRIP001 /*?*/ // We have to take care for ruby portions. //STRIP001 /*?*/ // The ruby portion is NOT centered //STRIP001 /*?*/ nOfst += nPorAscent; diff --git a/binfilter/bf_sw/source/core/text/sw_porfld.cxx b/binfilter/bf_sw/source/core/text/sw_porfld.cxx index a849ea62e..76ddb5417 100644 --- a/binfilter/bf_sw/source/core/text/sw_porfld.cxx +++ b/binfilter/bf_sw/source/core/text/sw_porfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_porfld.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -157,7 +157,7 @@ using namespace ::com::sun::star; /*N*/ void SwFldPortion::TakeNextOffset( const SwFldPortion* pFld ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ASSERT( pFld, "TakeNextOffset: Missing Source" ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ASSERT( pFld, "TakeNextOffset: Missing Source" ); //STRIP001 nNextOffset = pFld->GetNextOffset(); //STRIP001 aExpand.Erase( 0, nNextOffset ); //STRIP001 bFollow = sal_True; @@ -191,7 +191,7 @@ using namespace ::com::sun::star; /*N*/ { /*N*/ delete pFnt; /*N*/ if( pBlink ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( this ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( this ); /*N*/ } /************************************************************************* @@ -427,7 +427,7 @@ public: /*M*/ xub_StrLen nNextOfst = aExpand.Len() - nRest; /*M*/ /*M*/ if ( IsQuoVadisPortion() ) -/*?*/ { DBG_ASSERT(0, "STRIP"); }//STRIP001 nNextOfst += ((SwQuoVadisPortion*)this)->GetContTxt().Len(); +/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 nNextOfst += ((SwQuoVadisPortion*)this)->GetContTxt().Len(); /*M*/ /*M*/ XubString aNew( aExpand, nNextOfst, STRING_LEN ); /*M*/ aExpand.Erase( nNextOfst, STRING_LEN ); @@ -1065,7 +1065,7 @@ public: /*N*/ SwCombinedPortion::SwCombinedPortion( const XubString &rTxt ) /*N*/ : SwFldPortion( rTxt ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetLen(1); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetLen(1); //STRIP001 SetWhichPor( POR_COMBINED ); //STRIP001 if( aExpand.Len() > 6 ) //STRIP001 aExpand.Erase( 6 ); diff --git a/binfilter/bf_sw/source/core/text/sw_porlay.cxx b/binfilter/bf_sw/source/core/text/sw_porlay.cxx index d58dab2d0..29f9ae072 100644 --- a/binfilter/bf_sw/source/core/text/sw_porlay.cxx +++ b/binfilter/bf_sw/source/core/text/sw_porlay.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_porlay.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:53 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -179,7 +179,7 @@ namespace binfilter { /*N*/ if( GetNext() ) /*N*/ delete GetNext(); /*N*/ if( pBlink ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( this ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( this ); /*N*/ delete pSpaceAdd; /*N*/ if ( pKanaComp ) /*?*/ delete pKanaComp; @@ -200,7 +200,7 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns ) /*N*/ pPortion = new SwTxtPortion( *(SwLinePortion*)this ); /*N*/ if( IsBlinking() && pBlink ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SetBlinking( sal_False ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SetBlinking( sal_False ); //STRIP001 /*?*/ pBlink->Replace( this, pPortion ); /*N*/ } /*N*/ } @@ -929,7 +929,7 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns ) /*N*/ #ifdef BIDI /*N*/ // we search for connecting opportunities (kashida) /*N*/ else if ( bAdjustBlock && i18n::ScriptType::COMPLEX == nScript ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwScanner aScanner( rNode, NULL, //STRIP001 /*?*/ ::com::sun::star::i18n::WordType::DICTIONARY_WORD, //STRIP001 /*?*/ nLastKashida, nChg, sal_False, sal_False ); diff --git a/binfilter/bf_sw/source/core/text/sw_porlin.cxx b/binfilter/bf_sw/source/core/text/sw_porlin.cxx index 64a031cdc..e0c5e9a3c 100644 --- a/binfilter/bf_sw/source/core/text/sw_porlin.cxx +++ b/binfilter/bf_sw/source/core/text/sw_porlin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_porlin.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:24:30 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ const sal_Char *GetPortionName( const MSHORT nType ); /*N*/ SwLinePortion::~SwLinePortion() /*N*/ { /*N*/ if( pBlink ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( this ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( this ); /*N*/ } /*N*/ SwLinePortion *SwLinePortion::Compress() diff --git a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx index 25bd62038..c85134031 100644 --- a/binfilter/bf_sw/source/core/text/sw_pormulti.cxx +++ b/binfilter/bf_sw/source/core/text/sw_pormulti.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_pormulti.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:22 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -320,7 +320,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ SwBidiPortion::SwBidiPortion( xub_StrLen nEnd, BYTE nLv ) /*N*/ : SwMultiPortion( nEnd ), nLevel( nLv ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SetBidi(); //STRIP001 /*?*/ //STRIP001 /*?*/ if ( nLevel % 2 ) @@ -1025,7 +1025,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ BYTE nCurrLevel; /*N*/ if ( pMulti ) /*N*/ { - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ASSERT( pMulti->IsBidi(), "Nested MultiPortion is not BidiPortion" ) + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ASSERT( pMulti->IsBidi(), "Nested MultiPortion is not BidiPortion" ) //STRIP001 /*?*/ // level associated with bidi-portion; //STRIP001 /*?*/ nCurrLevel = ((SwBidiPortion*)pMulti)->GetLevel(); /*N*/ } @@ -2427,7 +2427,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ // If we are already in a multiportion, we could change to the /*N*/ // next line /*N*/ if( !pPor && pTmpMulti ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { //STRIP001 /*?*/ if( pMulti ) //STRIP001 /*?*/ { // We're already inside the multiportion, let's take the second //STRIP001 /*?*/ // line, if we are in a double line portion @@ -2469,7 +2469,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ } /*N*/ if( !pMulti ) /*N*/ return pRest; -/*N*/ {DBG_ASSERT(0, "STRIP");} +/*N*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nPos = nMultiPos + pMulti->GetLen(); //STRIP001 /*?*/ #ifdef BIDI //STRIP001 /*?*/ SwMultiCreator* pCreate = GetInfo().GetMultiCreator( nMultiPos, 0 ); diff --git a/binfilter/bf_sw/source/core/text/sw_porrst.cxx b/binfilter/bf_sw/source/core/text/sw_porrst.cxx index 763a9cb77..a5f797735 100644 --- a/binfilter/bf_sw/source/core/text/sw_porrst.cxx +++ b/binfilter/bf_sw/source/core/text/sw_porrst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_porrst.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,7 +158,7 @@ namespace binfilter { SwTmpEndPortion::SwTmpEndPortion( const SwLinePortion &rPortion ) { - DBG_ASSERT(0, "STRIP"); //STRIP001 Height( rPortion.Height() ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Height( rPortion.Height() ); //STRIP001 SetAscent( rPortion.GetAscent() ); //STRIP001 SetWhichPor( POR_TMPEND ); } @@ -287,7 +287,7 @@ SwTmpEndPortion::SwTmpEndPortion( const SwLinePortion &rPortion ) /*N*/ void SwKernPortion::Paint( const SwTxtPaintInfo &rInf ) const /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( Width() ) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if( Width() ) //STRIP001 { //STRIP001 // bBackground is set for Kerning Portions between two fields //STRIP001 if ( bBackground ) @@ -330,7 +330,7 @@ SwTmpEndPortion::SwTmpEndPortion( const SwLinePortion &rPortion ) /*N*/ SwArrowPortion::SwArrowPortion( const SwLinePortion &rPortion ) : /*N*/ bLeft( sal_True ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Height( rPortion.Height() ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Height( rPortion.Height() ); //STRIP001 SetAscent( rPortion.GetAscent() ); //STRIP001 nLineLength = 0; //STRIP001 SetWhichPor( POR_ARROW ); @@ -339,7 +339,7 @@ SwTmpEndPortion::SwTmpEndPortion( const SwLinePortion &rPortion ) /*N*/ SwArrowPortion::SwArrowPortion( const SwTxtPaintInfo &rInf ) /*N*/ : bLeft( sal_False ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 Height( (USHORT)(rInf.GetTxtFrm()->Prt().Height()) ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Height( (USHORT)(rInf.GetTxtFrm()->Prt().Height()) ); //STRIP001 aPos.X() = rInf.GetTxtFrm()->Frm().Left() + //STRIP001 rInf.GetTxtFrm()->Prt().Right(); //STRIP001 aPos.Y() = rInf.GetTxtFrm()->Frm().Top() + @@ -348,7 +348,7 @@ SwTmpEndPortion::SwTmpEndPortion( const SwLinePortion &rPortion ) /*N*/ void SwArrowPortion::Paint( const SwTxtPaintInfo &rInf ) const /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwArrowPortion*)this)->aPos = rInf.GetPos(); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwArrowPortion*)this)->aPos = rInf.GetPos(); /*N*/ } /*N*/ SwLinePortion *SwArrowPortion::Compress() { return this; } @@ -388,7 +388,7 @@ SwTmpEndPortion::SwTmpEndPortion( const SwLinePortion &rPortion ) /*N*/ MSHORT nRedlPos = pDoc->GetRedlinePos( rTxtNode ); /*N*/ if( MSHRT_MAX != nRedlPos ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SwAttrHandler aAttrHandler; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SwAttrHandler aAttrHandler; //STRIP001 /*?*/ aAttrHandler.Init( GetTxtNode()->GetSwAttrSet(), //STRIP001 /*?*/ *GetTxtNode()->GetDoc(), NULL ); //STRIP001 /*?*/ SwRedlineItr aRedln( rTxtNode, *pFnt, aAttrHandler, diff --git a/binfilter/bf_sw/source/core/text/sw_portxt.cxx b/binfilter/bf_sw/source/core/text/sw_portxt.cxx index 5a57e5aca..62387e19d 100644 --- a/binfilter/bf_sw/source/core/text/sw_portxt.cxx +++ b/binfilter/bf_sw/source/core/text/sw_portxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_portxt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:23 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,7 +185,7 @@ using namespace ::com::sun::star::i18n::ScriptType; /*N*/ /*N*/ if ( LANGUAGE_THAI == aLang ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nCnt = SwScriptInfo::ThaiJustify( *pStr, 0, 0, nPos, nEnd - nPos ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nCnt = SwScriptInfo::ThaiJustify( *pStr, 0, 0, nPos, nEnd - nPos ); //STRIP001 /*?*/ //STRIP001 /*?*/ const SwLinePortion* pPor = rPor.GetPortion(); //STRIP001 /*?*/ if ( pPor && pPor->IsKernPortion() ) @@ -202,7 +202,7 @@ using namespace ::com::sun::star::i18n::ScriptType; /*N*/ // Kashida Justification: Insert Kashidas /*N*/ if ( nEnd > nPos && pSI && COMPLEX == nScript ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ LanguageType aLang = + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ LanguageType aLang = //STRIP001 /*?*/ rInf.GetTxtFrm()->GetTxtNode()->GetLang( rInf.GetIdx(), 1, nScript ); //STRIP001 /*?*/ //STRIP001 /*?*/ if ( SwScriptInfo::IsArabicLanguage( aLang ) ) diff --git a/binfilter/bf_sw/source/core/text/sw_txtdrop.cxx b/binfilter/bf_sw/source/core/text/sw_txtdrop.cxx index c20b92273..cc6e10112 100644 --- a/binfilter/bf_sw/source/core/text/sw_txtdrop.cxx +++ b/binfilter/bf_sw/source/core/text/sw_txtdrop.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_txtdrop.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:24 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -223,7 +223,7 @@ public: /*N*/ { /*N*/ delete pPart; /*N*/ if( pBlink ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( this ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pBlink->Delete( this ); /*N*/ } /*N*/ sal_Bool SwTxtSizeInfo::_HasHint( const SwTxtNode* pTxtNode, xub_StrLen nPos ) diff --git a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx index aec1d03f8..12e4483ed 100644 --- a/binfilter/bf_sw/source/core/text/sw_txtfld.cxx +++ b/binfilter/bf_sw/source/core/text/sw_txtfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_txtfld.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:24 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,7 +151,7 @@ namespace binfilter { /*N*/ { /*N*/ case RES_SCRIPTFLD: /*N*/ case RES_POSTITFLD: - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRet = new SwPostItsPortion( RES_SCRIPTFLD == pFld->GetTyp()->Which() ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRet = new SwPostItsPortion( RES_SCRIPTFLD == pFld->GetTyp()->Which() ); /*?*/ break; /*?*/ /*?*/ case RES_COMBINED_CHARS: @@ -160,7 +160,7 @@ namespace binfilter { /*?*/ if( bName ) /*?*/ pRet = new SwFldPortion( sStr ); /*?*/ else - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRet = new SwCombinedPortion( sStr ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRet = new SwCombinedPortion( sStr ); /*?*/ } /*?*/ break; /*N*/ @@ -215,13 +215,13 @@ namespace binfilter { /*N*/ SwGetExpField* pExpFld = (SwGetExpField*)pFld; /*N*/ if( !::binfilter::lcl_IsInBody( pFrame ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pExpFld->ChgBodyTxtFlag( sal_False ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pExpFld->ChgBodyTxtFlag( sal_False ); //STRIP001 /*?*/ pExpFld->ChangeExpansion( *pFrame, *((SwTxtFld*)pHint) ); /*N*/ } /*N*/ else if( !pExpFld->IsInBodyTxt() ) /*N*/ { /*N*/ // war vorher anders, also erst expandieren, dann umsetzen!! -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pExpFld->ChangeExpansion( *pFrame, *((SwTxtFld*)pHint) ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pExpFld->ChangeExpansion( *pFrame, *((SwTxtFld*)pHint) ); //STRIP001 /*?*/ pExpFld->ChgBodyTxtFlag( sal_True ); /*N*/ } /*N*/ } @@ -254,7 +254,7 @@ namespace binfilter { /*N*/ } /*?*/ case RES_REFPAGEGETFLD: /*?*/ if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() ) - /*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ((SwRefPageGetField*)pFld)->ChangeExpansion( pFrame, (SwTxtFld*)pHint ); + /*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ((SwRefPageGetField*)pFld)->ChangeExpansion( pFrame, (SwTxtFld*)pHint ); /*?*/ pRet = new SwFldPortion( pFld->GetCntnt( bName ) ); /*?*/ break; /*N*/ @@ -336,7 +336,7 @@ namespace binfilter { /*?*/ } /*?*/ case RES_TXTATR_HARDBLANK : /*?*/ { - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRet = new SwBlankPortion( ((SwTxtHardBlank*)pHint)->GetChar() ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pRet = new SwBlankPortion( ((SwTxtHardBlank*)pHint)->GetChar() ); //STRIP001 /*?*/ break; /*?*/ } /*N*/ case RES_TXTATR_FIELD : @@ -345,7 +345,7 @@ namespace binfilter { /*N*/ break; /*N*/ } /*?*/ case RES_TXTATR_REFMARK : - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ { + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ { //STRIP001 /*?*/ pRet = new SwIsoRefPortion; //STRIP001 /*?*/ break; //STRIP001 /*?*/ } @@ -406,7 +406,7 @@ namespace binfilter { /*?*/ long nTmpA = rInf.GetLast()->GetAscent(); /*?*/ long nTmpD = rInf.GetLast()->Height() - nTmpA; /*?*/ if( !rInf.IsTest() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwGrfNumPortion*)pRet)->SetBase( nTmpA, nTmpD, nTmpA, nTmpD ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwGrfNumPortion*)pRet)->SetBase( nTmpA, nTmpD, nTmpA, nTmpD ); /*N*/ } /*N*/ else /*N*/ { diff --git a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx index 4661eb316..da6e8d66a 100644 --- a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx +++ b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_txtfly.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-13 14:30:53 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -329,7 +329,7 @@ namespace binfilter { /*N*/ KSHORT nAscent = pCurr->GetAscent() + nTmpHeight - pCurr->Height(); /*N*/ sal_uInt8 nFlags = SETBASE_ULSPACE; /*N*/ if( GetMulti() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { //STRIP001 /*?*/ aTmpInf.SetDirection( GetMulti()->GetDirection() ); //STRIP001 /*?*/ if( GetMulti()->HasRotation() ) //STRIP001 /*?*/ { @@ -364,7 +364,7 @@ namespace binfilter { /*N*/ nFlyAsc, nFlyDesc, pPos ); /*N*/ if( pPos->IsGrfNumPortion() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( !nFlyAsc && !nFlyDesc ) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( !nFlyAsc && !nFlyDesc ) //STRIP001 /*?*/ { //STRIP001 /*?*/ nTmpAscent = nAscent; //STRIP001 /*?*/ nFlyAsc = nAscent; @@ -386,7 +386,7 @@ namespace binfilter { /*N*/ } /*N*/ } /*N*/ if( pPos->IsMultiPortion() && ((SwMultiPortion*)pPos)->HasFlyInCntnt() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*N*/ { //STRIP001 /*?*/ ASSERT( !GetMulti(), "Too much multi" ); //STRIP001 /*?*/ ((SwTxtFormatter*)this)->pMulti = (SwMultiPortion*)pPos; //STRIP001 /*?*/ SwLineLayout *pLay = &GetMulti()->GetRoot(); @@ -441,7 +441,7 @@ namespace binfilter { /*N*/ sal_uInt8 nFlags = SETBASE_NOFLAG; /*N*/ if( GetMulti() && GetMulti()->HasRotation() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nFlags |= SETBASE_ROTATE; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nFlags |= SETBASE_ROTATE; //STRIP001 /*?*/ if( GetMulti()->IsRevers() ) //STRIP001 /*?*/ nFlags |= SETBASE_REVERSE; /*N*/ } @@ -462,7 +462,7 @@ namespace binfilter { /*N*/ Point aBase; /*N*/ if ( GetInfo().GetTxtFrm()->IsVertical() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nBaseLine = GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( nBaseLine ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nBaseLine = GetInfo().GetTxtFrm()->SwitchHorizontalToVertical( nBaseLine ); //STRIP001 /*?*/ aBase = Point( nBaseLine, ((SwFlyCntPortion*)pPos)->GetRefPoint().Y() ); /*N*/ } /*N*/ else @@ -520,7 +520,7 @@ namespace binfilter { /*?*/ pFrm->SwitchHorizontalToVertical( aLineVert ); /*N*/ aInter = rInf.GetTxtFly()->GetFrm( aLineVert ); /*N*/ if ( pFrm->IsVertical() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchVerticalToHorizontal( aInter ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchVerticalToHorizontal( aInter ); /*N*/ /*N*/ // new flys from below? /*N*/ if( !pPos->IsFlyPortion() ) @@ -629,17 +629,17 @@ namespace binfilter { /*N*/ /*N*/ SwRect aLineVert( aLine ); /*N*/ if ( pFrm->IsRightToLeft() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( aLineVert ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchLTRtoRTL( aLineVert ); /*N*/ /*N*/ if ( pFrm->IsVertical() ) /*N*/ pFrm->SwitchHorizontalToVertical( aLineVert ); /*N*/ SwRect aInter( pTxtFly->GetFrm( aLineVert ) ); /*N*/ /*N*/ if ( pFrm->IsRightToLeft() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchRTLtoLTR( aInter ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchRTLtoLTR( aInter ); /*N*/ /*N*/ if ( pFrm->IsVertical() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchVerticalToHorizontal( aInter ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pFrm->SwitchVerticalToHorizontal( aInter ); /*N*/ /*N*/ if( aInter.IsOver( aLine ) ) /*N*/ { @@ -709,7 +709,7 @@ namespace binfilter { /*N*/ SWRECTFN( pFrm ) /*N*/ long nNextTop = pTxtFly->GetNextTop(); /*N*/ if ( bVert ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nNextTop = pFrm->SwitchVerticalToHorizontal( nNextTop ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nNextTop = pFrm->SwitchVerticalToHorizontal( nNextTop ); /*N*/ if( nNextTop > aInter.Bottom() ) /*N*/ { /*N*/ SwTwips nH = nNextTop - aInter.Top(); @@ -828,7 +828,7 @@ namespace binfilter { /*N*/ sal_uInt8 nMode = IsQuick() ? SETBASE_QUICK : 0; /*N*/ if( GetMulti() && GetMulti()->HasRotation() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nMode |= SETBASE_ROTATE; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nMode |= SETBASE_ROTATE; //STRIP001 /*?*/ if( GetMulti()->IsRevers() ) //STRIP001 /*?*/ nMode |= SETBASE_REVERSE; /*N*/ } @@ -1633,7 +1633,7 @@ namespace binfilter { /*N*/ // Vorsicht #37347: Das GetContour() fuehrt zum Laden der Grafik, /*N*/ // diese aendert dadurch ggf. ihre Groesse, ruft deshalb ein /*N*/ // ClrObject() auf. -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 PolyPolygon aPoly; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 PolyPolygon aPoly; //STRIP001 /*?*/ if( !((SwVirtFlyDrawObj*)pObj)->GetFlyFrm()->GetContour( aPoly ) ) //STRIP001 /*?*/ aPoly = PolyPolygon( ((SwVirtFlyDrawObj*)pObj)-> //STRIP001 /*?*/ GetFlyFrm()->Frm().SVRect() ); diff --git a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx index 9339e0e26..b2fe566cd 100644 --- a/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx +++ b/binfilter/bf_sw/source/core/text/sw_txtfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_txtfrm.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -501,7 +501,7 @@ namespace binfilter { // Entfernt die Anhaengsel des Textfrms wenn dieser hidden ist /*N*/ void SwTxtFrm::HideHidden() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 ASSERT( IsHiddenNow(), "HideHidden on visible frame" ); //STRIP001 //STRIP001 //Erst die Fussnoten diff --git a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx index 30e97151c..b9823f1c5 100644 --- a/binfilter/bf_sw/source/core/text/sw_txtftn.cxx +++ b/binfilter/bf_sw/source/core/text/sw_txtftn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_txtftn.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -276,7 +276,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ /*N*/ SwTwips nRet = aLine.Y() + SwTwips(aLine.GetLineHeight()); /*N*/ if( IsVertical() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nRet = SwitchHorizontalToVertical( nRet ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nRet = SwitchHorizontalToVertical( nRet ); /*N*/ /*N*/ UNDO_SWAP( this ) /*N*/ @@ -521,7 +521,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*?*/ } /*?*/ } /*?*/ else if( GetFollow() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ { + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ { //STRIP001 /*?*/ SwCntntFrm *pDest = GetFollow(); //STRIP001 /*?*/ while( pDest->GetFollow() && ((SwTxtFrm*)pDest-> //STRIP001 /*?*/ GetFollow())->GetOfst() <= nIdx ) @@ -560,7 +560,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, //STRIP001 /*?*/ } /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( !bEndDoc || ( bEndn && pEndBoss->IsInSct() && +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( !bEndDoc || ( bEndn && pEndBoss->IsInSct() && //STRIP001 /*?*/ !SwLayouter::Collecting( GetNode()->GetDoc(), //STRIP001 /*?*/ pEndBoss->FindSctFrm(), NULL ) ) ) //STRIP001 /*?*/ { @@ -665,7 +665,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ } /*N*/ else if( bEnd && pSect ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFtnFrm *pFtnFrm = pSrcFrm ? pBoss->FindFtn( pSrcFrm, pFtn ) : NULL; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFtnFrm *pFtnFrm = pSrcFrm ? pBoss->FindFtn( pSrcFrm, pFtn ) : NULL; //STRIP001 /*?*/ if( pFtnFrm && !pFtnFrm->GetUpper() ) //STRIP001 /*?*/ pFtnFrm = NULL; //STRIP001 /*?*/ SwDoc *pDoc = GetNode()->GetDoc(); @@ -700,7 +700,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*?*/ if( !pSrcFrm ) /*?*/ pBoss->AppendFtn( this, pFtn ); /*?*/ else if( pSrcFrm != this ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pBoss->ChangeFtnRef( pSrcFrm, pFtn, this ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pBoss->ChangeFtnRef( pSrcFrm, pFtn, this ); /*?*/ bInFtnConnect = sal_False; /*?*/ return; /*N*/ } @@ -729,7 +729,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ //Wenn die Fussnote bei einem Follow angemeldet ist, so ist /*N*/ //es jetzt an der Zeit sie umzumelden. /*N*/ if ( pSrcFrm != this ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pBoss->ChangeFtnRef( pSrcFrm, pFtn, this ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pBoss->ChangeFtnRef( pSrcFrm, pFtn, this ); /*N*/ //Es steht Platz zur Verfuegung, also kann die Fussnote evtl. /*N*/ //wachsen. /*N*/ if ( pFtnFrm->GetFollow() && nDiff > 0 ) @@ -761,7 +761,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ { // Wenn unser Boss in einem spaltigen Bereich sitzt, es aber auf /*N*/ // der Seite schon einen FtnContainer gibt, hilft nur die brutale /*N*/ // Methode - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( pSect && pSect->FindFtnBossFrm( !bEnd )->FindFtnCont() ) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( pSect && pSect->FindFtnBossFrm( !bEnd )->FindFtnCont() ) //STRIP001 /*?*/ bBrutal = sal_True; //STRIP001 // OD 08.11.2002 #104840# - use <SwLayoutFrm::IsBefore(..)> //STRIP001 /*?*/ else if ( !pFtnFrm->GetPrev() || @@ -862,7 +862,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ SWRECTFN( pFrm ) /*N*/ /*N*/ if( bVert ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nLower = pFrm->SwitchHorizontalToVertical( nLower ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nLower = pFrm->SwitchHorizontalToVertical( nLower ); /*N*/ /*N*/ SwTwips nAdd; /*N*/ @@ -1004,7 +1004,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*?*/ SwFtnContFrm* pFtnC = pTmp->FindFtnCont(); /*?*/ if( pFtnC ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFtnFrm* pTmp = (SwFtnFrm*)pFtnC->Lower(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFtnFrm* pTmp = (SwFtnFrm*)pFtnC->Lower(); //STRIP001 /*?*/ if( pTmp && *pTmp < pFtn ) //STRIP001 /*?*/ { //STRIP001 /*?*/ rInf.SetStop( sal_True ); @@ -1017,7 +1017,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ SwTwips nTmpBot = Y() + nReal * 2; /*N*/ /*N*/ if( bVert ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nTmpBot = pFrm->SwitchHorizontalToVertical( nTmpBot ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nTmpBot = pFrm->SwitchHorizontalToVertical( nTmpBot ); /*N*/ /*N*/ SWRECTFN( pFtnCont ) /*N*/ @@ -1143,7 +1143,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*?*/ const SwPageFrm* pQuoPage = pQuoFrm->FindPageFrm(); /*?*/ if( pPage == pQuoFrm->FindPageFrm() ) /*?*/ return 0; // Wenn der QuoVadis auf der selben (spaltigen) Seite steht - {DBG_ASSERT(0, "STRIP");} return 0;//STRIP001 /*?*/ const XubString aPage = lcl_GetPageNumber( pPage ); + {DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 /*?*/ const XubString aPage = lcl_GetPageNumber( pPage ); //STRIP001 /*?*/ SwParaPortion *pPara = pQuoFrm->GetPara(); //STRIP001 /*?*/ if( pPara ) //STRIP001 /*?*/ pPara->SetErgoSumNum( aPage ); @@ -1200,7 +1200,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*M*/ FeedInf( rInf ); /*M*/ SeekStartAndChg( rInf, sal_True ); /*M*/ if( GetRedln() && pCurr->HasRedline() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 GetRedln()->Seek( *pFnt, nOffset, 0 ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 GetRedln()->Seek( *pFnt, nOffset, 0 ); /*M*/ /*M*/ // Ein fieser Sonderfall: Flyfrms reichen in die Zeile und stehen /*M*/ // natuerlich da, wo wir unseren Quovadis Text reinsetzen wollen. @@ -1517,7 +1517,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ void SwFtnPortion::Paint( const SwTxtPaintInfo &rInf ) const /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwFtnSave aFtnSave( rInf, pFtn ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwFtnSave aFtnSave( rInf, pFtn ); //STRIP001 rInf.DrawViewOpt( *this, POR_FTN ); //STRIP001 SwExpandPortion::Paint( rInf ); /*N*/ } @@ -1528,7 +1528,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ SwPosSize SwFtnPortion::GetTxtSize( const SwTxtSizeInfo &rInfo ) const /*N*/ { - DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 SwFtnSave aFtnSave( rInfo, pFtn ); + DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 SwFtnSave aFtnSave( rInfo, pFtn ); //STRIP001 return SwExpandPortion::GetTxtSize( rInfo ); /*N*/ } @@ -1734,7 +1734,7 @@ extern BYTE WhichFont( xub_StrLen nIdx, const String* pTxt, /*N*/ if( !pQuo ) /*N*/ return sal_False; /*N*/ - {DBG_ASSERT(0, "STRIP");} return sal_False;//STRIP001 /*?*/ return pQuo->GetQuoTxt() == rQuo; + {DBG_BF_ASSERT(0, "STRIP");} return sal_False;//STRIP001 /*?*/ return pQuo->GetQuoTxt() == rQuo; /*N*/ } diff --git a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx index 38d04d6a5..4694f2319 100644 --- a/binfilter/bf_sw/source/core/text/sw_txthyph.cxx +++ b/binfilter/bf_sw/source/core/text/sw_txthyph.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_txthyph.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:25 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -404,7 +404,7 @@ using namespace ::com::sun::star::i18n; /*N*/ /*N*/ // first case: hyphenated word has alternative spelling /*N*/ if ( xHyphWord.is() && xHyphWord->isAlternativeSpelling() ) { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SvxAlternativeSpelling aAltSpell; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SvxAlternativeSpelling aAltSpell; //STRIP001 /*?*/ aAltSpell = SvxGetAltSpelling( xHyphWord ); //STRIP001 /*?*/ ASSERT( aAltSpell.bIsAltSpelling, "no alternatve spelling" ); //STRIP001 /*?*/ @@ -735,7 +735,7 @@ using namespace ::com::sun::star::i18n; /*N*/ void SwSoftHyphStrPortion::Paint( const SwTxtPaintInfo &rInf ) const /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // Bug oder feature?: +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 // Bug oder feature?: //STRIP001 // {Zu}{k-}{ker}, {k-} wird grau statt {-} //STRIP001 rInf.DrawViewOpt( *this, POR_SOFTHYPH ); //STRIP001 SwHyphStrPortion::Paint( rInf ); @@ -744,7 +744,7 @@ using namespace ::com::sun::star::i18n; /*N*/ SwSoftHyphStrPortion::SwSoftHyphStrPortion( const XubString &rStr ) /*N*/ : SwHyphStrPortion( rStr ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetLen( 1 ); +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SetLen( 1 ); //STRIP001 SetWhichPor( POR_SOFTHYPHSTR ); /*N*/ } diff --git a/binfilter/bf_sw/source/core/text/sw_widorp.cxx b/binfilter/bf_sw/source/core/text/sw_widorp.cxx index e4e0ae570..b2a81c012 100644 --- a/binfilter/bf_sw/source/core/text/sw_widorp.cxx +++ b/binfilter/bf_sw/source/core/text/sw_widorp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_widorp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -187,7 +187,7 @@ namespace binfilter { /*N*/ /*N*/ SwTwips nTmpY; /*N*/ if ( pFrm->IsVertical() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nTmpY = pFrm->SwitchHorizontalToVertical( rLine.Y() + rLine.GetLineHeight() ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nTmpY = pFrm->SwitchHorizontalToVertical( rLine.Y() + rLine.GetLineHeight() ); /*N*/ else /*N*/ nTmpY = rLine.Y() + rLine.GetLineHeight(); /*N*/ @@ -440,7 +440,7 @@ sal_Bool SwTxtFrmBreak::WouldFit( SwTxtMargin &rLine ) /*N*/ /*N*/ if ( bVert ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nTmpY = pFrm->SwitchHorizontalToVertical( nTmpY ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ nTmpY = pFrm->SwitchHorizontalToVertical( nTmpY ); //STRIP001 /*?*/ nOldHeight = -(pFrm->Prt().*fnRect->fnGetHeight)(); /*N*/ } /*N*/ else diff --git a/binfilter/bf_sw/source/core/text/txtpaint.hxx b/binfilter/bf_sw/source/core/text/txtpaint.hxx index 2a5bbd844..38a409bd7 100644 --- a/binfilter/bf_sw/source/core/text/txtpaint.hxx +++ b/binfilter/bf_sw/source/core/text/txtpaint.hxx @@ -2,9 +2,9 @@ * * $RCSfile: txtpaint.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:27 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,7 +106,7 @@ public: //STRIP001 inline void ChgClip( const SwRect &rRect, sal_Bool bEnlargeRect = sal_False ) //STRIP001 { if( pOut ) _ChgClip( rRect, bEnlargeRect ); } //STRIP001 #endif - void Reset(){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void Reset(); + void Reset(){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void Reset(); inline sal_Bool IsOn() const { return bOn; } inline sal_Bool IsChg() const { return bChg; } inline sal_Bool IsOut() const { return 0 != pOut; } diff --git a/binfilter/bf_sw/source/core/text/widorp.hxx b/binfilter/bf_sw/source/core/text/widorp.hxx index 629b8bf13..4e8d28927 100644 --- a/binfilter/bf_sw/source/core/text/widorp.hxx +++ b/binfilter/bf_sw/source/core/text/widorp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: widorp.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:27 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,7 +105,7 @@ public: void SetRstHeight( const SwTxtMargin &rLine ) { if ( pFrm->IsVertical() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 nRstHeight = nOrigin - pFrm->SwitchHorizontalToVertical( rLine.Y() ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nRstHeight = nOrigin - pFrm->SwitchHorizontalToVertical( rLine.Y() ); else nRstHeight = rLine.Y() - nOrigin; } diff --git a/binfilter/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx index 46992ad0c..7e2f58bbf 100644 --- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx +++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_tox.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2004-04-22 15:41:28 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -425,7 +425,7 @@ namespace binfilter { /*N*/ for( USHORT i = 1; i < GetFormMax(); ++i, ++nPoolId ) // Nr 0 ist der Titel /*N*/ { /*N*/ if(TOX_AUTHORITIES == nType) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 SetPattern(i, lcl_GetAuthPattern(i)); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SetPattern(i, lcl_GetAuthPattern(i)); /*N*/ else /*N*/ SetPattern( i, sStr ); /*N*/ @@ -782,7 +782,7 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; } /*N*/ xub_StrLen nOpenPos = sRet.Search('<', nOpenStart); /*N*/ if(nOpenPos != STRING_NOTFOUND && nOpenPos > 0) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nOffset = lcl_ConvertTextIntoPattern( sRet, 0, nOpenPos); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nOffset = lcl_ConvertTextIntoPattern( sRet, 0, nOpenPos); //STRIP001 /*?*/ nCloseStart += nOffset; //STRIP001 /*?*/ nClosePos += nOffset; //STRIP001 /*?*/ nOpenStart = nClosePos; @@ -794,7 +794,7 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; } /*N*/ { /*N*/ if(nClosePos < nOpenPos - 1) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 USHORT nOffset = lcl_ConvertTextIntoPattern(sRet, nClosePos + 1, nOpenPos); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nOffset = lcl_ConvertTextIntoPattern(sRet, nClosePos + 1, nOpenPos); //STRIP001 /*?*/ nOpenStart += nOffset; //STRIP001 /*?*/ nCloseStart = nOpenStart; /*N*/ } @@ -808,7 +808,7 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; } /*N*/ } /*N*/ //is there any text at the end? /*N*/ if(nClosePos != STRING_NOTFOUND && nClosePos < sRet.Len() - 1) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 lcl_ConvertTextIntoPattern(sRet, nClosePos + 1, sRet.Len()); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 lcl_ConvertTextIntoPattern(sRet, nClosePos + 1, sRet.Len()); /*N*/ if(eType != TOX_INDEX) /*N*/ { /*N*/ // set most left tab stop to right alignment and FillChar == '.' diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx index 923bb3621..91f3c2b6f 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_atrfld.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -153,7 +153,7 @@ namespace binfilter { int SwFmtFld::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); //STRIP001 return pField->GetTyp() == ((SwFmtFld&)rAttr).GetFld()->GetTyp() && //STRIP001 pField->GetFormat() == ((SwFmtFld&)rAttr).GetFld()->GetFormat(); } @@ -214,7 +214,7 @@ int SwFmtFld::operator==( const SfxPoolItem& rAttr ) const /*?*/ SwUserFieldType* pType = (SwUserFieldType*)GetFld()->GetTyp(); /*?*/ if(!pType->IsValid()) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwCalc aCalc( *pTxtNd->GetDoc() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwCalc aCalc( *pTxtNd->GetDoc() ); //STRIP001 /*?*/ pType->GetValue( aCalc ); /*?*/ } /*N*/ } diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx index 682304883..0348c1b1f 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_atrflyin.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ namespace binfilter { int __EXPORT SwFmtFlyCnt::operator==( const SfxPoolItem& rAttr ) const { - DBG_ASSERT(0, "STRIP"); return 0; //STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); //STRIP001 return( pTxtAttr && ((SwFmtFlyCnt&)rAttr).pTxtAttr && //STRIP001 *pTxtAttr->GetStart() == *((SwFmtFlyCnt&)rAttr).pTxtAttr->GetStart() && //STRIP001 pFmt == ((SwFmtFlyCnt&)rAttr).GetFrmFmt() ); diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx index c2c747ead..704f53779 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_atrftn.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:39 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,7 +131,7 @@ namespace binfilter { int SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const { - {DBG_ASSERT(0, "STRIP");} return 0;//STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + {DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); //STRIP001 return nNumber == ((SwFmtFtn&)rAttr).nNumber && //STRIP001 aNumber == ((SwFmtFtn&)rAttr).aNumber && //STRIP001 bEndNote == ((SwFmtFtn&)rAttr).bEndNote; @@ -288,7 +288,7 @@ int SwFmtFtn::operator==( const SfxPoolItem& rAttr ) const /*?*/ // Werden die Nodes nicht geloescht mussen sie bei den Seiten /*?*/ // abmeldet (Frms loeschen) werden, denn sonst bleiben sie /*?*/ // stehen (Undo loescht sie nicht!) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelFrms(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ DelFrms(); /*N*/ } /*N*/ DELETEZ( pStartNode ); /*N*/ diff --git a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx index dcd71a829..7e1a3c62b 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_atrref.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_atrref.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:40 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ namespace binfilter { int SwFmtRefMark::operator==( const SfxPoolItem& rAttr ) const { - {DBG_ASSERT(0, "STRIP");} return 0;//STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); + {DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); //STRIP001 return aRefName == ((SwFmtRefMark&)rAttr).aRefName; } diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx index fe0c2ebc6..126c410c6 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_fntcache.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-11 15:30:21 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -345,7 +345,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat ); *************************************************************************/ /*N*/ void SwFntObj::CreateScrFont( const ViewShell *pSh, const OutputDevice& rOut ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 static sal_Char __READONLY_DATA sStandardString[] = "Dies ist der Teststring"; //STRIP001 //STRIP001 if ( pScrFont ) @@ -762,7 +762,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat ); //STRIP001 } /*N*/ sal_Bool lcl_IsMonoSpaceFont( const OutputDevice* pOut ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return sal_False; //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return sal_False; //STRIP001 //STRIP001 /*?*/ if ( ! pOut ) //STRIP001 /*?*/ return sal_False; //STRIP001 /*?*/ @@ -1863,7 +1863,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat ); /*N*/ // This is the part used e.g., for cursor travelling /*N*/ // See condition for DrawText or DrawTextArray (bDirectPrint) /*N*/ if ( pPrinter && pPrinter != rInf.GetpOut() ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( !pPrtFont->IsSameInstance( pPrinter->GetFont() ) ) //STRIP001 /*?*/ pPrinter->SetFont(*pPrtFont); //STRIP001 /*?*/ aTxtSize.Width() = pPrinter->GetTextWidth( rInf.GetText(), @@ -1937,7 +1937,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat ); /*N*/ if( !pPrtFont->IsSameInstance( rInf.GetpOut()->GetFont() ) ) /*N*/ rInf.GetpOut()->SetFont( *pPrtFont ); /*N*/ if( bCompress ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ long *pKernArray = new long[nLn]; //STRIP001 /*?*/ rInf.GetpOut()->GetTextArray( rInf.GetText(), pKernArray, //STRIP001 /*?*/ rInf.GetIdx(), nLn ); @@ -2317,7 +2317,7 @@ extern USHORT UnMapDirection( USHORT nDir, const BOOL bVertFormat ); /*N*/ } /*N*/ /*N*/ if( aSub[nActual].IsCapital() && nLn ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nTxtBreak = GetCapitalBreak( rInf.GetShell(), rInf.GetpOut(), +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nTxtBreak = GetCapitalBreak( rInf.GetShell(), rInf.GetpOut(), //STRIP001 /*?*/ rInf.GetScriptInfo(), rInf.GetText(), nTextWidth,0, rInf.GetIdx(),nLn ); /*N*/ else /*N*/ { diff --git a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx index 0505cea02..845ef4bfc 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_fntcap.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -768,7 +768,7 @@ public: /*?*/ ++nTmp; /*?*/ if( nOldPos < nTmp ) /*?*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pLastFont = pSpaceFont; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pLastFont = pSpaceFont; //STRIP001 /*?*/ pLastFont->SetDevFont( rDo.GetInf().GetShell(), //STRIP001 /*?*/ rDo.GetOut() ); //STRIP001 /*?*/ ((SwDoDrawCapital&)rDo).DrawSpace( aStartPos ); @@ -870,7 +870,7 @@ public: /*N*/ { /*N*/ if( rDo.GetInf().GetDrawSpace() ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pLastFont = pSpaceFont; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pLastFont = pSpaceFont; //STRIP001 /*?*/ pLastFont->SetDevFont( rDo.GetInf().GetShell(), rDo.GetOut() ); //STRIP001 /*?*/ ( (SwDoDrawCapital&) rDo ).DrawSpace( aStartPos ); /*N*/ } diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx index 289b8846d..0af17e5ad 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ndhints.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:23:03 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ namespace binfilter { /*N*/ const SwpHtEnd &rHtEnd ) /*N*/ { #ifndef PRODUCT - DBG_ASSERT(0, "STRIP");//STRIP001 aDbstream << "DumpHints:" << endl; + DBG_BF_ASSERT(0, "STRIP");//STRIP001 aDbstream << "DumpHints:" << endl; //STRIP001 (aDbstream << "\tStarts:" ).WriteNumber(rHtStart.Count()) << endl; //STRIP001 for( USHORT i = 0; i < rHtStart.Count(); ++i ) //STRIP001 { diff --git a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx index 202361734..32af5c9c5 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ndtxt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:41 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -275,11 +275,11 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ switch( ( pNd = (*this)[aTmp] )->GetNodeType() ) /*N*/ { /*?*/ case ND_TABLENODE: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ((SwTableNode*)pNd)->MakeFrms( aIdx ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((SwTableNode*)pNd)->MakeFrms( aIdx ); /*?*/ return pNode; /*?*/ /*?*/ case ND_SECTIONNODE: -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( ((SwSectionNode*)pNd)->GetSection().IsHidden() || +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( ((SwSectionNode*)pNd)->GetSection().IsHidden() || //STRIP001 /*?*/ ((SwSectionNode*)pNd)->IsCntntHidden() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ SwNodeIndex aTmpIdx( *pNode ); @@ -512,7 +512,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*?*/ Cut( pNode, aIdx, nSplitPos ); /*?*/ /*?*/ if( GetWrong() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pNode->SetWrong( GetWrong()->SplitList( nSplitPos ) ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pNode->SetWrong( GetWrong()->SplitList( nSplitPos ) ); /*?*/ /*?*/ SetWrongDirty( TRUE ); /*?*/ @@ -597,7 +597,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*?*/ } /*?*/ } /*?*/ if( pSwpHints ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ MoveTxtAttr_To_AttrSet(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ MoveTxtAttr_To_AttrSet(); /*?*/ pNode->MakeFrms( *this ); // neue Frames anlegen. /*?*/ lcl_ChangeFtnRef( *this ); /*N*/ } @@ -615,7 +615,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ // Attribute loeschen /*N*/ if( pSwpHints ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SwTxtAttr* pHt; + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SwTxtAttr* pHt; //STRIP001 /*?*/ xub_StrLen* pEnd; //STRIP001 /*?*/ for( register USHORT j = pSwpHints->Count(); j; ) //STRIP001 /*?*/ if( ( pHt = pSwpHints->GetHt( --j ) )->DontExpand() && @@ -630,7 +630,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ /*N*/ if( pList ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pNode->SetWrong( pList->SplitList( nSplitPos ) ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pNode->SetWrong( pList->SplitList( nSplitPos ) ); //STRIP001 /*?*/ pWrong = pList; /*N*/ } /*N*/ @@ -697,7 +697,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ SwWrongList *pList = GetWrong(); /*N*/ if( pList ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pList->JoinList( pTxtNode->GetWrong(), nOldLen ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pList->JoinList( pTxtNode->GetWrong(), nOldLen ); //STRIP001 /*?*/ SetWrongDirty( TRUE ); //STRIP001 /*?*/ pWrong = NULL; /*N*/ } @@ -706,7 +706,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ pList = pTxtNode->GetWrong(); /*N*/ if( pList ) /*N*/ { - DBG_ASSERT(0, "STRIP");//STRIP001 /*?*/ pList->Move( 0, nOldLen ); + DBG_BF_ASSERT(0, "STRIP");//STRIP001 /*?*/ pList->Move( 0, nOldLen ); //STRIP001 /*?*/ SetWrongDirty( TRUE ); //STRIP001 /*?*/ pTxtNode->pWrong = NULL; /*N*/ } @@ -747,7 +747,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ SwWrongList *pList = pTxtNode->GetWrong(); /*N*/ if( pList ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pList->JoinList( GetWrong(), Len() ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pList->JoinList( GetWrong(), Len() ); //STRIP001 /*?*/ SetWrongDirty( TRUE ); //STRIP001 /*?*/ pTxtNode->pWrong = NULL; //STRIP001 /*?*/ SetWrong( NULL ); @@ -757,7 +757,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ pList = GetWrong(); /*N*/ if( pList ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pList->Move( 0, nLen ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ pList->Move( 0, nLen ); //STRIP001 /*?*/ SetWrongDirty( TRUE ); //STRIP001 /*?*/ pWrong = NULL; /*N*/ } @@ -1230,7 +1230,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ // Wenn wir es mit einem Fussnoten-Attribut zu tun haben, /*N*/ // muessen wir natuerlich auch den Fussnotenbereich kopieren. /*N*/ case RES_TXTATR_FTN : - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwTxtFtn*)pHt)->CopyFtn( (SwTxtFtn*)pNewHt ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwTxtFtn*)pHt)->CopyFtn( (SwTxtFtn*)pNewHt ); /*?*/ break; /*N*/ /*N*/ // Beim Kopieren von Feldern in andere Dokumente @@ -1241,7 +1241,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ { /*N*/ const SwFmtFld& rFld = pHt->GetFld(); /*N*/ if( pOtherDoc ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwTxtFld*)pHt)->CopyFld( (SwTxtFld*)pNewHt ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ ((SwTxtFld*)pHt)->CopyFld( (SwTxtFld*)pNewHt ); /*N*/ /*N*/ // Tabellenformel ?? /*N*/ if( RES_TABLEFLD == rFld.GetFld()->GetTyp()->Which() @@ -1290,7 +1290,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*?*/ const SwDoc* pDoc; /*?*/ if( 0!=( pDoc = ((SwTxtINetFmt*)pHt)->GetTxtNode().GetDoc() ) ) /*?*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ const SwCharFmts* pCharFmts = pDoc->GetCharFmts(); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ const SwCharFmts* pCharFmts = pDoc->GetCharFmts(); //STRIP001 /*?*/ const SwFmtINetFmt& rFmt = pHt->GetINetFmt(); //STRIP001 /*?*/ SwCharFmt* pFmt; //STRIP001 /*?*/ pFmt = lcl_FindCharFmt( pCharFmts, rFmt.GetINetFmt() ); @@ -2555,7 +2555,7 @@ SV_DECL_PTRARR(SwpHts,SwTxtAttr*,1,1) /*N*/ ++rTxtStt; /*N*/ break; /*N*/ case RES_TXTATR_HARDBLANK: - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ rTxt.SetChar( nPos, ((SwTxtHardBlank*)pAttr)->GetChar() ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ rTxt.SetChar( nPos, ((SwTxtHardBlank*)pAttr)->GetChar() ); //STRIP001 /*?*/ ++nPos; //STRIP001 /*?*/ ++nEndPos; /*?*/ break; diff --git a/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx b/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx index 2f5c3a987..1f25b214b 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swfont.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:42 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1207,7 +1207,7 @@ using namespace ::com::sun::star::i18n::ScriptType; /*N*/ rInf.SetLen( nLn ); /*N*/ xub_StrLen nCrsr = 0; /*N*/ if( IsCapital() && nLn ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nCrsr = GetCapitalCrsrOfst( rInf ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ nCrsr = GetCapitalCrsrOfst( rInf ); /*N*/ else /*N*/ { /*N*/ const XubString &rOldTxt = rInf.GetText(); @@ -1215,9 +1215,9 @@ using namespace ::com::sun::star::i18n::ScriptType; /*N*/ rInf.SetKern( CheckKerning() ); /*N*/ SV_STAT( nGetTextSize ); /*N*/ if ( !IsCaseMap() ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 nCrsr = pLastFont->GetCrsrOfst( rInf ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 nCrsr = pLastFont->GetCrsrOfst( rInf ); /*N*/ else -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ String aTmp = CalcCaseMap( rInf.GetText() ); //STRIP001 /*?*/ rInf.SetText( aTmp ); //STRIP001 /*?*/ nCrsr = pLastFont->GetCrsrOfst( rInf ); diff --git a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx index 8aa888556..9e84ffc96 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_thints.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_thints.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-05-04 14:34:37 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -297,10 +297,10 @@ using namespace ::com::sun::star::i18n; /*?*/ ((SwTxtFtn*)pNew)->SetSeqNo( ((SwFmtFtn&)rAttr).GetTxtFtn()->GetSeqRefNo() ); /*N*/ break; /*?*/ case RES_TXTATR_HARDBLANK: - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pNew = new SwTxtHardBlank( (SwFmtHardBlank&)rNew, nStt ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pNew = new SwTxtHardBlank( (SwFmtHardBlank&)rNew, nStt ); /*?*/ break; /*?*/ case RES_CHRATR_TWO_LINES: - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pNew = new SwTxt2Lines( (SvxTwoLinesItem&)rNew, nStt, nEnd ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pNew = new SwTxt2Lines( (SvxTwoLinesItem&)rNew, nStt, nEnd ); /*?*/ break; /*N*/ case RES_TXTATR_REFMARK: /*N*/ pNew = nStt == nEnd @@ -312,7 +312,7 @@ using namespace ::com::sun::star::i18n; /*N*/ break; /*N*/ case RES_UNKNOWNATR_CONTAINER: /*?*/ case RES_TXTATR_UNKNOWN_CONTAINER: - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pNew = new SwTxtXMLAttrContainer( (SvXMLAttrContainerItem&)rNew, + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ pNew = new SwTxtXMLAttrContainer( (SvXMLAttrContainerItem&)rNew, //STRIP001 /*?*/ nStt, nEnd ); /*?*/ break; /*N*/ case RES_TXTATR_CJK_RUBY: @@ -803,7 +803,7 @@ using namespace ::com::sun::star::i18n; /*N*/ if( RES_TXTATR_CHARFMT == pItem->Which() && /*N*/ GetDoc()->GetDfltCharFmt()==((SwFmtCharFmt*)pItem)->GetCharFmt()) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SwIndex aIndex( this, nStt ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ SwIndex aIndex( this, nStt ); //STRIP001 /*?*/ RstAttr( aIndex, nEnd - nStt, RES_TXTATR_CHARFMT, 0 ); //STRIP001 /*?*/ DontExpandFmt( aIndex ); /*N*/ } @@ -1132,7 +1132,7 @@ using namespace ::com::sun::star::i18n; /*?*/ const SfxPoolItem* pItem = aIter.GetCurItem(); /*?*/ while( TRUE ) /*?*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( lcl_IsNewAttrInSet( *pSwpHints, *pItem, GetTxt().Len() ) ) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( lcl_IsNewAttrInSet( *pSwpHints, *pItem, GetTxt().Len() ) ) //STRIP001 /*?*/ { //STRIP001 /*?*/ pSwpHints->SwpHintsArr::Insert( //STRIP001 /*?*/ MakeTxtAttr( *pItem, 0, GetTxt().Len() ) ); @@ -1157,7 +1157,7 @@ using namespace ::com::sun::star::i18n; /*N*/ /*N*/ if( aThisSet.Count() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxItemIter aIter( aThisSet ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxItemIter aIter( aThisSet ); //STRIP001 /*?*/ const SfxPoolItem* pItem = aIter.GetCurItem(), *pNdItem; //STRIP001 /*?*/ while( TRUE ) //STRIP001 /*?*/ { @@ -1183,7 +1183,7 @@ using namespace ::com::sun::star::i18n; /*?*/ const SfxPoolItem* pItem = aIter.GetCurItem(); /*?*/ while( TRUE ) /*?*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( lcl_IsNewAttrInSet( *pNd->pSwpHints, *pItem, pNd->GetTxt().Len() ) ) + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ if( lcl_IsNewAttrInSet( *pNd->pSwpHints, *pItem, pNd->GetTxt().Len() ) ) //STRIP001 /*?*/ pNd->pSwpHints->SwpHintsArr::Insert( //STRIP001 /*?*/ pNd->MakeTxtAttr( *pItem, 0, pNd->GetTxt().Len() ) ); //STRIP001 /*?*/ pNd->GetpSwAttrSet()->ClearItem( pItem->Which() ); @@ -1734,7 +1734,7 @@ using namespace ::com::sun::star::i18n; /*N*/ pDoc->InsertFldType( *pFld->GetTyp() ); /*N*/ if( pFldType != pFld->GetTyp() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFmtFld* pFmtFld = (SwFmtFld*)&((SwTxtFld*)pHint) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFmtFld* pFmtFld = (SwFmtFld*)&((SwTxtFld*)pHint) //STRIP001 /*?*/ ->GetFld(); //STRIP001 /*?*/ pFldType->Add( pFmtFld ); // ummelden //STRIP001 /*?*/ pFmtFld->GetFld()->ChgTyp( pFldType ); @@ -1753,7 +1753,7 @@ using namespace ::com::sun::star::i18n; /*N*/ break; /*N*/ } /*N*/ if( bInsFldType ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pDoc->InsDeletedFldType( *pFld->GetTyp() ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pDoc->InsDeletedFldType( *pFld->GetTyp() ); /*N*/ } /*N*/ } /*N*/ break; @@ -1773,7 +1773,7 @@ using namespace ::com::sun::star::i18n; /*N*/ 0 != ( pHtEnd = pHt->GetEnd() ) && /*N*/ 0 != ( pHintEnd = pHint->GetEnd() ) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwComparePosition eCmp = ::ComparePosition( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwComparePosition eCmp = ::ComparePosition( //STRIP001 /*?*/ *pHt->GetStart(), *pHtEnd, //STRIP001 /*?*/ *pHint->GetStart(), *pHintEnd ); //STRIP001 /*?*/ BOOL bDelOld = TRUE, bChgStart = FALSE, bChgEnd = FALSE; @@ -1811,7 +1811,7 @@ using namespace ::com::sun::star::i18n; /*N*/ /*N*/ case RES_TXTATR_CJK_RUBY: /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ((SwTxtRuby*)pHint)->ChgTxtNode( &rNode ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ((SwTxtRuby*)pHint)->ChgTxtNode( &rNode ); //STRIP001 /*?*/ SwCharFmt* pFmt = rNode.GetDoc()->GetCharFmtFromPool( //STRIP001 /*?*/ RES_POOLCHR_RUBYTEXT ); //STRIP001 /*?*/ pFmt->Add( (SwTxtRuby*)pHint ); @@ -1921,7 +1921,7 @@ using namespace ::com::sun::star::i18n; /*N*/ { /*?*/ if( !bOtherFmt ) /*?*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ bOtherFmt = !lcl_Included( pOther->Which(), + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ bOtherFmt = !lcl_Included( pOther->Which(), //STRIP001 /*?*/ pHint ); //STRIP001 /*?*/ bCheckInclude = TRUE; /*?*/ } diff --git a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx index 1c4131842..6f223e2a0 100644 --- a/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx +++ b/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_txtedt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:51:44 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -343,7 +343,7 @@ bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh ) /*M*/ /*M*/ /*M*/ if( nStart <= nAttrStart ) // Faelle: 1,3,5 -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( nEnd > nAttrStart //STRIP001 /*?*/ || ( nEnd == *pAttrEnd && nEnd==nAttrStart ) ) //STRIP001 /*?*/ { @@ -386,7 +386,7 @@ bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh ) /*M*/ } /*M*/ else // Faelle: 2,4,5 /*M*/ if( *pAttrEnd > nStart ) // Faelle: 2,4 -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if( *pAttrEnd < nEnd ) // Fall: 2 //STRIP001 /*?*/ { //STRIP001 /*?*/ if ( nMin > nAttrStart ) @@ -635,7 +635,7 @@ bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh ) /*M*/ return FALSE; /*M*/ /*M*/ if( pWrong ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ xub_StrLen nOldBegin = nBegin; //STRIP001 /*?*/ nBegin = bReverse ? pWrong->LastWrong( nBegin ) //STRIP001 /*?*/ : pWrong->NextWrong( nBegin ); diff --git a/binfilter/bf_sw/source/core/view/sw_scrrect.cxx b/binfilter/bf_sw/source/core/view/sw_scrrect.cxx index 3a3c69086..7bf775a7c 100644 --- a/binfilter/bf_sw/source/core/view/sw_scrrect.cxx +++ b/binfilter/bf_sw/source/core/view/sw_scrrect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_scrrect.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:24:33 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -161,7 +161,7 @@ namespace binfilter { ******************************************************************************/ /*N*/ void ViewShell::Scroll() -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwScrollAreas *pScrollRects = Imp()->GetScrollRects(); //STRIP001 if ( pScrollRects ) //STRIP001 { @@ -286,7 +286,7 @@ namespace binfilter { /*N*/ aRect.Pos().Y() -= nOffs; /*N*/ if( aRect.IsOver( pSh->VisArea() ) ) /*N*/ { - DBG_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ASSERT( pSh->GetWin(), "Scrolling without outputdevice" ); + DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ ASSERT( pSh->GetWin(), "Scrolling without outputdevice" ); //STRIP001 /*?*/ aRect._Intersection( pSh->VisArea() ); //STRIP001 /*?*/ SwStripes *pStr; //STRIP001 /*?*/ if ( !pScrollRects ) @@ -505,7 +505,7 @@ namespace binfilter { /*N*/ IMPL_LINK( SwViewImp, RefreshScrolledHdl, Timer *, EMPTYARG ) /*N*/ { - {DBG_ASSERT(0, "STRIP");} return 0;//STRIP001 DBG_PROFSTART( RefreshTimer ); + {DBG_BF_ASSERT(0, "STRIP");} return 0;//STRIP001 DBG_PROFSTART( RefreshTimer ); //STRIP001 //STRIP001 if ( !IsScrolled() ) //STRIP001 { DBG_PROFSTOP( RefreshTimer ); diff --git a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx index 4b4692754..211abbe58 100644 --- a/binfilter/bf_sw/source/core/view/sw_viewimp.cxx +++ b/binfilter/bf_sw/source/core/view/sw_viewimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_viewimp.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:52:11 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -430,7 +430,7 @@ namespace binfilter { /*N*/ void SwViewImp::DisposeAccessible( const SwFrm *pFrm, /*N*/ const SdrObject *pObj, /*N*/ sal_Bool bRecursive ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ ASSERT( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" ); //STRIP001 /*N*/ ViewShell *pVSh = GetShell(); //STRIP001 /*N*/ ViewShell *pTmp = pVSh; @@ -444,7 +444,7 @@ namespace binfilter { /*N*/ void SwViewImp::MoveAccessible( const SwFrm *pFrm, const SdrObject *pObj, /*N*/ const SwRect& rOldFrm ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ ASSERT( !pFrm || pFrm->IsAccessibleFrm(), "frame is not accessible" ); //STRIP001 /*N*/ ViewShell *pVSh = GetShell(); //STRIP001 /*N*/ ViewShell *pTmp = pVSh; @@ -458,7 +458,7 @@ namespace binfilter { /*N*/ } /*N*/ void SwViewImp::InvalidateAccessibleFrmContent( const SwFrm *pFrm ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ ASSERT( pFrm->IsAccessibleFrm(), "frame is not accessible" ); //STRIP001 /*N*/ ViewShell *pVSh = GetShell(); //STRIP001 /*N*/ ViewShell *pTmp = pVSh; diff --git a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx index 8c7d3cfb5..e5e566ace 100644 --- a/binfilter/bf_sw/source/core/view/sw_viewsh.cxx +++ b/binfilter/bf_sw/source/core/view/sw_viewsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_viewsh.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2003-11-18 19:24:34 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -277,7 +277,7 @@ FASTBOOL bInSizeNotify = FALSE; /*?*/ // to give it a chance to react with proper IAO updates /*?*/ if (HasDrawView()) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 GetDrawView()->ForceInvalidateMarkHandles(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 GetDrawView()->ForceInvalidateMarkHandles(); //STRIP001 /*?*/ //STRIP001 /*?*/ // #94195# set remark //STRIP001 /*?*/ bRefreshMarker = sal_True; @@ -299,14 +299,14 @@ FASTBOOL bInSizeNotify = FALSE; /*?*/ BOOL bShowCrsr = (pRegion || Imp()->GetScrollRects()) && /*?*/ IsA( TYPE(SwCrsrShell) ); /*?*/ if( bShowCrsr ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 ((SwCrsrShell*)this)->HideCrsrs(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 ((SwCrsrShell*)this)->HideCrsrs(); /*?*/ /*?*/ Scroll(); /*?*/ if ( bPaintsFromSystem && Imp()->pScrolledArea ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ Imp()->FlushScrolledArea(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ Imp()->FlushScrolledArea(); /*?*/ /*?*/ if ( pRegion ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ { + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ { //STRIP001 /*?*/ SwRootFrm* pLayout = GetLayout(); //STRIP001 /*?*/ //STRIP001 /*?*/ Imp()->pRegion = NULL; @@ -1685,7 +1685,7 @@ FASTBOOL bInSizeNotify = FALSE; /*N*/ { /*N*/ aBrowseBorder = rNew; /*N*/ if ( aVisArea.HasArea() ) - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ CheckBrowseView( FALSE ); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ CheckBrowseView( FALSE ); /*N*/ } /*N*/ } @@ -1700,7 +1700,7 @@ FASTBOOL bInSizeNotify = FALSE; /*N*/ void ViewShell::CheckBrowseView( FASTBOOL bBrowseChgd ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !bBrowseChgd && !GetDoc()->IsBrowseMode() ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !bBrowseChgd && !GetDoc()->IsBrowseMode() ) //STRIP001 return; //STRIP001 //STRIP001 SET_CURR_SHELL( this ); @@ -1878,7 +1878,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( !bBrowseChgd && !GetDoc()-> /*N*/ } /*N*/ void ViewShell::SetPrintData(SwPrintData& rPrtData) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 GetDoc()->SetPrintData(rPrtData); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 GetDoc()->SetPrintData(rPrtData); /*N*/ } /*N*/ const SwNodes& ViewShell::GetNodes() const diff --git a/binfilter/bf_sw/source/core/view/sw_vnew.cxx b/binfilter/bf_sw/source/core/view/sw_vnew.cxx index 6ae0c6a79..992557077 100644 --- a/binfilter/bf_sw/source/core/view/sw_vnew.cxx +++ b/binfilter/bf_sw/source/core/view/sw_vnew.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_vnew.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:52:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -238,7 +238,7 @@ namespace binfilter { /*N*/ if ( bPreView ) /*N*/ { /*N*/ // OD 12.12.2002 #103492# - init page preview layout -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pImp->InitPagePreviewLayout(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pImp->InitPagePreviewLayout(); /*N*/ } /*N*/ /*N*/ SET_CURR_SHELL( this ); @@ -289,7 +289,7 @@ namespace binfilter { /*N*/ bPreView = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags ); /*N*/ // OD 12.12.2002 #103492# /*N*/ if ( bPreView ) -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 pImp->InitPagePreviewLayout(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pImp->InitPagePreviewLayout(); /*N*/ /*N*/ SET_CURR_SHELL( this ); /*N*/ diff --git a/binfilter/bf_sw/source/core/view/sw_vprint.cxx b/binfilter/bf_sw/source/core/view/sw_vprint.cxx index 228cdba05..96b1282e1 100644 --- a/binfilter/bf_sw/source/core/view/sw_vprint.cxx +++ b/binfilter/bf_sw/source/core/view/sw_vprint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_vprint.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:52:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -948,7 +948,7 @@ SwQueuedPaint *SwPaintQueue::pQueue = 0; //STRIP001 return pPrtDoc; //STRIP001 } /*N*/ SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt) -/*N*/ {DBG_ASSERT(0, "STRIP"); return NULL;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 //STRIP001 /*?*/ ASSERT( this->IsA( TYPE(SwFEShell) ),"ViewShell::Prt for FEShell only"); //STRIP001 /*?*/ SwFEShell* pFESh = (SwFEShell*)this; //STRIP001 /*?*/ // Wir bauen uns ein neues Dokument @@ -1047,7 +1047,7 @@ SwQueuedPaint *SwPaintQueue::pQueue = 0; /*N*/ BOOL ViewShell::Prt( SwPrtOptions& rOptions, SfxProgress& rProgress, /*N*/ OutputDevice *pPDFOut ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 /*?*/ //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //STRIP001 /*?*/ //Immer die Druckroutine in viewpg.cxx (fuer Seitenvorschau) mitpflegen!! //STRIP001 /*?*/ //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/binfilter/bf_sw/source/filter/ascii/sw_ascatr.cxx b/binfilter/bf_sw/source/filter/ascii/sw_ascatr.cxx index ef07aa30e..a497559c7 100644 --- a/binfilter/bf_sw/source/filter/ascii/sw_ascatr.cxx +++ b/binfilter/bf_sw/source/filter/ascii/sw_ascatr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_ascatr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:52:14 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -202,7 +202,7 @@ public: /*?*/ break; /*?*/ /*?*/ case RES_TXTATR_HARDBLANK: - {DBG_ASSERT(0, "STRIP");} //STRIP001 /*?*/ sOut = ((SwTxtHardBlank*)pHt)->GetChar(); + {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 /*?*/ sOut = ((SwTxtHardBlank*)pHt)->GetChar(); /*?*/ break; /*?*/ /*?*/ case RES_TXTATR_FTN: diff --git a/binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx b/binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx index fcdd089ce..7f577ede4 100644 --- a/binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx +++ b/binfilter/bf_sw/source/filter/ascii/sw_wrtasc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_wrtasc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:52:14 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -222,7 +222,7 @@ namespace binfilter { /*?*/ const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx(); /*?*/ if( pIdx ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 delete pCurPam; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 delete pCurPam; //STRIP001 /*?*/ pCurPam = NewSwPaM( *pDoc, pIdx->GetIndex(), //STRIP001 /*?*/ pIdx->GetNode().EndOfSectionIndex() ); //STRIP001 /*?*/ pCurPam->Exchange(); diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx index b9b6b789f..544ffb3d1 100644 --- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx +++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_fltini.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:23:04 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1355,7 +1355,7 @@ SwRead ReadRtf = 0, ReadAscii = 0, ReadSwg = 0, ReadSw3 = 0, /*N*/ void SwAsciiOptions::WriteUserData( String& rStr ) /*N*/ { /*?*/ // 1. charset -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rStr = NameFromCharSet(eCharSet); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rStr = NameFromCharSet(eCharSet); //STRIP001 /*?*/ rStr += ','; //STRIP001 /*?*/ //STRIP001 /*?*/ // 2. LineEnd diff --git a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx index 3c1214b3e..738450b72 100644 --- a/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx +++ b/binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_shellio.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:52:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -188,7 +188,7 @@ using namespace ::com::sun::star; /*N*/ if( 0 != (po->pMedium = pMedium ) && /*?*/ 1 ) //STRIP001 !po->SetStrmStgPtr() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 po->SetReadUTF8( FALSE ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 po->SetReadUTF8( FALSE ); //STRIP001 /*?*/ po->SetBlockMode( FALSE ); //STRIP001 /*?*/ po->SetOrganizerMode( FALSE ); //STRIP001 /*?*/ po->SetIgnoreHTMLComments( FALSE ); @@ -271,7 +271,7 @@ using namespace ::com::sun::star; /*N*/ if( bDocUndo || pCrsr ) /*N*/ { /*?*/ // Pam auf den Node davor setzen damit er nicht mit verschoben wird -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwNodeIndex& rTmp = pPam->GetPoint()->nNode; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwNodeIndex& rTmp = pPam->GetPoint()->nNode; //STRIP001 /*?*/ pUndoPam = new SwPaM( rTmp, rTmp, 0, -1 ); /*N*/ } /*N*/ @@ -363,7 +363,7 @@ using namespace ::com::sun::star; /*?*/ if( FLY_PAGE == rAnchor.GetAnchorId() ) /*?*/ { /*?*/ if( !rAnchor.GetCntntAnchor() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pFrmFmt->MakeFrms(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pFrmFmt->MakeFrms(); /*?*/ else if( pCrsr ) /*?*/ // seitengebundene Flys eingefuegt, dann schalte /*?*/ // die Optimierungs-Flags vom SwDoc ab. Sonst @@ -371,7 +371,7 @@ using namespace ::com::sun::star; /*?*/ pDoc->SetLoaded( FALSE ); /*?*/ } /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pFrmFmt->MakeFrms(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pFrmFmt->MakeFrms(); /*?*/ } /*?*/ } /*?*/ } @@ -381,14 +381,14 @@ using namespace ::com::sun::star; /*?*/ /*?*/ pDoc->SetRedlineMode_intern( eOld ); /*?*/ if( pDoc->IsRedlineOn() ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pDoc->AppendRedline( new SwRedline( REDLINE_INSERT, *pUndoPam )); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pDoc->AppendRedline( new SwRedline( REDLINE_INSERT, *pUndoPam )); /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pDoc->SplitRedline( *pUndoPam ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pDoc->SplitRedline( *pUndoPam ); /*?*/ pDoc->SetRedlineMode_intern( REDLINE_IGNORE ); /*N*/ } /*N*/ if( bSaveUndo ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pDoc->SetRedlineMode_intern( eOld ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pDoc->SetRedlineMode_intern( eOld ); //STRIP001 /*?*/ pUndo->SetInsertRange( *pUndoPam, FALSE ); //STRIP001 /*?*/ pDoc->AppendUndo( pUndo ); //STRIP001 /*?*/ pDoc->SetRedlineMode_intern( REDLINE_IGNORE ); @@ -690,7 +690,7 @@ using namespace ::com::sun::star; /*?*/ } /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pTemplate = new SwDoc; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pTemplate = new SwDoc; //STRIP001 /*?*/ pTemplate->AddLink(); //STRIP001 /*?*/ //STRIP001 /*?*/ // sicher ist sicher @@ -721,7 +721,7 @@ using namespace ::com::sun::star; /*N*/ if( pTemplate ) /*N*/ { /*?*/ rDoc.RemoveAllFmtLanguageDependencies(); -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 rDoc.ReplaceStyles( *pTemplate ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDoc.ReplaceStyles( *pTemplate ); //STRIP001 /*?*/ rDoc.SetFixFields(); //STRIP001 /*?*/ bRet = TRUE; /*N*/ } @@ -1039,7 +1039,7 @@ SwWriter::SwWriter( SfxMedium& rMedium, SwPaM& rPam, BOOL bWriteAll ) /*N*/ /*N*/ if ( pShell && !bWriteAll && pShell->IsTableMode() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bWriteAll = TRUE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bWriteAll = TRUE; //STRIP001 /*?*/ pDoc = new SwDoc; //STRIP001 /*?*/ pDoc->AddLink(); //STRIP001 /*?*/ pRefForDocSh = new SvEmbeddedObjectRef(); @@ -1083,7 +1083,7 @@ SwWriter::SwWriter( SfxMedium& rMedium, SwPaM& rPam, BOOL bWriteAll ) /*N*/ { /*?*/ if( pShell ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pShell->Push(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pShell->Push(); //STRIP001 /*?*/ pShell->SttDoc(); //STRIP001 /*?*/ pShell->SetMark(); //STRIP001 /*?*/ pShell->EndDoc(); @@ -1140,7 +1140,7 @@ SwWriter::SwWriter( SfxMedium& rMedium, SwPaM& rPam, BOOL bWriteAll ) /*N*/ /*N*/ ULONG nError = 0; /*N*/ if( pMedium ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nError = rxWriter->Write( *pPam, *pMedium, pRealFileName ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nError = rxWriter->Write( *pPam, *pMedium, pRealFileName ); /*N*/ else if( pStg ) /*N*/ nError = rxWriter->Write( *pPam, *pStg, pRealFileName ); /*N*/ else if( pStrm ) @@ -1157,7 +1157,7 @@ SwWriter::SwWriter( SfxMedium& rMedium, SwPaM& rPam, BOOL bWriteAll ) /*N*/ if(!bHasMark) /*N*/ { /*?*/ if( pShell ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pShell->Pop( FALSE ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pShell->Pop( FALSE ); /*?*/ else /*?*/ delete pPam; /*N*/ } @@ -1189,7 +1189,7 @@ SwWriter::SwWriter( SfxMedium& rMedium, SwPaM& rPam, BOOL bWriteAll ) /*N*/ BOOL SetHTMLTemplate( SwDoc & rDoc ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 // Vorlagennamen von den Sfx-HTML-Filter besorgen!!! +DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 // Vorlagennamen von den Sfx-HTML-Filter besorgen!!! //STRIP001 if( !ReadHTML->GetTemplateDoc() ) //STRIP001 ReadHTML->MakeHTMLDummyTemplateDoc(); //STRIP001 diff --git a/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx b/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx index ba1a3fbec..8358f0545 100644 --- a/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx +++ b/binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_w4wflt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:52:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -200,7 +200,7 @@ namespace binfilter {//STRIP009 // !! THIS function is for the DLL and EXE - code !! /*N*/ USHORT AutoDetec( const String& rFileName, USHORT & rVersion ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 /*N*/ ByteString aFileNm( rFileName, ::gsl_getSystemTextEncoding() ); //STRIP001 /*N*/ USHORT nFileType = 0; //STRIP001 /*N*/ diff --git a/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx b/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx index 08c9cf96c..23f81e970 100644 --- a/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx +++ b/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: SwAppletImpl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:52:45 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,13 +117,13 @@ class SwApplet_Impl //STRIP001 String sAlt; public: - static USHORT GetOptionType( const String& rName, BOOL bApplet ){DBG_ASSERT(0, "STRIP"); return 0;} //STRIP001 static USHORT GetOptionType( const String& rName, BOOL bApplet ); + static USHORT GetOptionType( const String& rName, BOOL bApplet ){DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 static USHORT GetOptionType( const String& rName, BOOL bApplet ); //STRIP001 SwApplet_Impl( SfxItemPool& rPool, USHORT nWhich1, USHORT nWhich2 ); SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {} - ~SwApplet_Impl(){DBG_ASSERT(0, "STRIP");}; //STRIP001 ~SwApplet_Impl(); + ~SwApplet_Impl(){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 ~SwApplet_Impl(); void CreateApplet( const String& rCode, const String& rName,//STRIP001 void CreateApplet( const String& rCode, const String& rName, - BOOL bMayScript, const String& rCodeBase ){DBG_ASSERT(0, "STRIP");}; //STRIP001 //STRIP001 BOOL bMayScript, const String& rCodeBase ); + BOOL bMayScript, const String& rCodeBase ){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 //STRIP001 BOOL bMayScript, const String& rCodeBase ); sal_Bool CreateApplet(); //STRIP001 //const String& rAlt ); //STRIP001 void FinishApplet(); diff --git a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx index 0e4019f74..eceefe924 100644 --- a/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_apphdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_apphdl.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:53:51 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -391,7 +391,7 @@ namespace binfilter { /*M*/ while(nWhich) /*M*/ { /*M*/ if(pActView) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ sal_Bool bReadonly = pActView->GetDocShell()->IsReadOnly(); //STRIP001 /*?*/ sal_Bool bBrowse = pDoc ? pDoc->IsBrowseMode() : sal_False; //STRIP001 /*?*/ if ( bReadonly && nWhich != FN_VIEW_GRAPHIC ) @@ -488,7 +488,7 @@ namespace binfilter { /*N*/void SwModule::StateOther(SfxItemSet &rSet) /*N*/{ -DBG_ASSERT(0, "STRIP"); //STRIP001 SfxWhichIter aIter(rSet); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxWhichIter aIter(rSet); //STRIP001 sal_uInt16 nWhich = aIter.FirstWhich(); //STRIP001 //STRIP001 SwView* pActView = ::GetActiveView(); @@ -559,7 +559,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxWhichIter aIter(rSet); /*N*/void SwModule::ExecWizzard(SfxRequest & rReq) /*N*/{ -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 Wizzard( rReq.GetSlot() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 Wizzard( rReq.GetSlot() ); /*N*/} /*-------------------------------------------------------------------- @@ -568,7 +568,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxWhichIter aIter(rSet); /*N*/ void SwModule::ExecViewOptions(SfxRequest &rReq) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwViewOption* pOpt = 0; //STRIP001 OfficeApplication* pOffApp = OFF_APP(); //STRIP001 sal_Bool bModified = sal_True; @@ -833,7 +833,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxWhichIter aIter(rSet); /*N*/void SwModule::ExecOther(SfxRequest& rReq) /*N*/{ -DBG_ASSERT(0, "STRIP"); //STRIP001 const SfxItemSet *pArgs = rReq.GetArgs(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SfxItemSet *pArgs = rReq.GetArgs(); //STRIP001 const SfxPoolItem* pItem = 0; //STRIP001 //STRIP001 sal_uInt16 nWhich = rReq.GetSlot(); @@ -1000,7 +1000,7 @@ SfxMacro *SwWriterApp::CreateMacro() const /*M*/ // alle FIX-Date/Time Felder auf akt. setzen /*M*/ if( pWrtSh ) /*M*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 pWrtSh->SetFixFields(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pWrtSh->SetFixFields(); //STRIP001 /*?*/ pWrtSh->UpdateInputFlds(); //STRIP001 /*?*/ //STRIP001 /*?*/ // Sind Datenbankfelder enthalten? @@ -1022,7 +1022,7 @@ SfxMacro *SwWriterApp::CreateMacro() const /*M*/ { /*M*/ if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().GetItemState(SID_ATTR_PATHNAME)) /*M*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ::GetGlossaries()->UpdateGlosPath( sal_False ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ::GetGlossaries()->UpdateGlosPath( sal_False ); //STRIP001 /*?*/ SwGlossaryList* pList = ::GetGlossaryList(); //STRIP001 /*?*/ if(pList->IsActive()) //STRIP001 /*?*/ pList->Update(); @@ -1037,7 +1037,7 @@ SfxMacro *SwWriterApp::CreateMacro() const /*M*/ ULONG nHintId = ((SfxSimpleHint&)rHint).GetId(); /*M*/ if(SFX_HINT_COLORS_CHANGED == nHintId || /*N*/ SFX_HINT_ACCESSIBILITY_CHANGED == nHintId ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ sal_Bool bAccessibility = sal_False; //STRIP001 /*?*/ if(SFX_HINT_COLORS_CHANGED == nHintId) //STRIP001 /*?*/ SwViewOption::ApplyColorConfigValues(*pColorConfig); diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx index c997997c6..b6a23b6c8 100644 --- a/binfilter/bf_sw/source/ui/app/sw_docsh.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_docsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docsh.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-20 04:58:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -344,7 +344,7 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_ /*N*/ SwCrsrShell *pCrsrShell, /*N*/ SwPaM* pPaM ) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); return NULL; //STRIP001 BOOL bAPICall = FALSE; +/*N*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; //STRIP001 BOOL bAPICall = FALSE; //STRIP001 const SfxPoolItem* pApiItem; //STRIP001 const SfxItemSet* pMedSet; //STRIP001 if( 0 != ( pMedSet = rMedium.GetItemSet() ) && SFX_ITEM_SET == @@ -561,7 +561,7 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_ /*?*/ default: /*?*/ { /*?*/ if( pDoc->ContainsMSVBasic() ) - /*?*/ {DBG_ASSERT(0, "STRIP");//STRIP001 + /*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001 //STRIP001 /*?*/ SvxImportMSVBasic aTmp( *this, *pIo->GetStorage() ); //STRIP001 /*?*/ aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr ); //STRIP001 /*?*/ if( OFF_APP()->GetFilterOptions()->IsLoadWordBasicStorage() ) @@ -644,7 +644,7 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_ /*N*/ pOldFilter->GetUserData().EqualsAscii( "WW6" ) || /*N*/ pOldFilter->GetUserData().EqualsAscii( "WW1" ) )) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 // when saving it in our own fileformat, then remove the template +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // when saving it in our own fileformat, then remove the template /*?*/ // name from the docinfo. //STRIP001 /*?*/ SfxDocumentInfo aInfo = GetDocInfo(); //STRIP001 /*?*/ if( aInfo.GetTemplateName().Len() || @@ -682,7 +682,7 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_ /*N*/ if( pDoc->ContainsMSVBasic() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SvxImportMSVBasic aTmp( *this, *pIo->GetStorage() ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SvxImportMSVBasic aTmp( *this, *pIo->GetStorage() ); //STRIP001 /*?*/ aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr ); //STRIP001 /*?*/ if( OFF_APP()->GetFilterOptions()->IsLoadWordBasicStorage() ) //STRIP001 /*?*/ nVBWarning = SvxImportMSVBasic:: @@ -1272,7 +1272,7 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_ /*?*/ /*?*/ case SID_ATTR_YEAR2000: /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SvNumberFormatter* pFmtr = pDoc->GetNumberFormatter(FALSE); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SvNumberFormatter* pFmtr = pDoc->GetNumberFormatter(FALSE); //STRIP001 /*?*/ rSet.Put( SfxUInt16Item( nWhich, //STRIP001 /*?*/ pFmtr ? pFmtr->GetYear2000() //STRIP001 /*?*/ : SFX_APP()->GetMiscConfig()->GetYear2000() )); @@ -1422,7 +1422,7 @@ SFX_IMPL_OBJECTFACTORY_DLL(SwDocShell, SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_ /*N*/ SfxViewFrame* pVFrame = SfxViewFrame::GetFirst(this); /*N*/ if(pVFrame) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxViewShell* pShell = pVFrame->GetViewShell(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxViewShell* pShell = pVFrame->GetViewShell(); //STRIP001 /*?*/ if(PTR_CAST(SwSrcView, pShell)) //STRIP001 /*?*/ ((SwSrcView*)pShell)->Load(this); /*N*/ } diff --git a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx index d24f58a90..7de5f37f0 100644 --- a/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_docsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docsh2.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:53:54 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -431,7 +431,7 @@ using namespace sfx2; /*N*/ void SwDoc::SetInfo( const SfxDocumentInfo& rInfo ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if( pDocShell ) +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( pDocShell ) //STRIP001 pDocShell->SetDocumentInfo( rInfo ); //STRIP001 //STRIP001 // sollte nur beim "Konvertieren" von Dokumenten hier ankommen! @@ -737,7 +737,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pDocShell ) /*N*/ void SwDocShell::Execute(SfxRequest& rReq) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const SfxItemSet* pArgs = rReq.GetArgs(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SfxItemSet* pArgs = rReq.GetArgs(); //STRIP001 /*?*/ const SfxPoolItem* pItem; //STRIP001 /*?*/ USHORT nWhich = rReq.GetSlot(); //STRIP001 /*?*/ BOOL bDone = FALSE; @@ -1610,13 +1610,13 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pDocShell ) /*N*/ SwFldDlgWrapper *pWrp = (SwFldDlgWrapper*)pVFrame-> /*N*/ GetChildWindow( SwFldDlgWrapper::GetChildWindowId() ); /*N*/ if( pWrp ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pWrp->ReInitDlg( this ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pWrp->ReInitDlg( this ); // RedlineDlg ggf neu initialisieren /*N*/ SwRedlineAcceptChild *pRed = (SwRedlineAcceptChild*)pVFrame-> /*N*/ GetChildWindow( SwRedlineAcceptChild::GetChildWindowId() ); /*N*/ if( pRed ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pRed->ReInitDlg( this ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pRed->ReInitDlg( this ); /*N*/ } /*-------------------------------------------------------------------- @@ -1734,7 +1734,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pDocShell ) ---------------------------------------------------------------------------*/ /*?*/ void SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* pView ) -/*?*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 GetDoc()->SetBrowseMode( bSet ); //STRIP001 UpdateFontList(); //STRIP001 SwView* pTempView = pView ? pView : (SwView*)GetView(); @@ -1777,7 +1777,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if( pDocShell ) /*N*/ULONG SwDocShell::LoadStylesFromFile( const String& rURL, /*N*/ SwgReaderOption& rOpt, BOOL bUnoCall ) /*N*/{ -/*N*/ ULONG nErr = 0;DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ ULONG nErr = 0;DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 //STRIP001 // Create a URL from filename //STRIP001 INetURLObject aURLObj( rURL ); diff --git a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx index aefc0b274..65e0acd8c 100644 --- a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docshini.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: aw $ $Date: 2004-04-19 10:23:06 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -316,7 +316,7 @@ using namespace ::rtl; /*N*/ Sequence<Locale> aLocales = aAsian.GetStartEndCharLocales(); /*N*/ if(aLocales.getLength()) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 const Locale* pLocales = aLocales.getConstArray(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const Locale* pLocales = aLocales.getConstArray(); //STRIP001 /*?*/ for(sal_Int32 i = 0; i < aLocales.getLength(); i++) //STRIP001 /*?*/ { //STRIP001 /*?*/ ForbiddenCharacters aForbidden; @@ -367,7 +367,7 @@ using namespace ::rtl; /*N*/ USHORT nFontId = aFontIds[i]; /*N*/ SvxFontItem* pFontItem = 0; /*N*/ if(!pStdFont->IsFontDefault(nFontId)) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ sEntry = pStdFont->GetFontFor(nFontId); //STRIP001 /*?*/ sal_Bool bDelete = sal_False; //STRIP001 /*?*/ const SfxFont* pFnt = pPrt ? pPrt->GetFontByName(sEntry): 0; @@ -578,7 +578,7 @@ using namespace ::rtl; /*N*/ if( !pIo ) /*N*/ pIo = new Sw3Io( *pDoc ); /*N*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pIo->SetDoc( *pDoc ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pIo->SetDoc( *pDoc ); /*N*/ /*N*/ SetPool(&pDoc->GetAttrPool()); @@ -697,13 +697,13 @@ using namespace ::rtl; /*?*/ } /*?*/ } /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 nErr = pIo->LoadStyles( pStor ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 nErr = pIo->LoadStyles( pStor ); /*?*/ break; /*N*/ case SFX_CREATE_MODE_INTERNAL: /*N*/ case SFX_CREATE_MODE_EMBEDDED: /*N*/ if ( bXML ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ // fuer MWERKS (Mac-Compiler): kann nicht selbststaendig casten //STRIP001 /*?*/ SvEmbeddedObject* pObj = this; //STRIP001 /*?*/ SwTransferable::InitOle( pObj, *pDoc ); @@ -871,7 +871,7 @@ using namespace ::rtl; /*?*/ } /*?*/ } /*?*/ else -/*?*/ {DBG_ASSERT(0, "STRIP"); }//STRIP001 nErr = pIo->LoadStyles( pStor ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 nErr = pIo->LoadStyles( pStor ); /*?*/ } /*?*/ else /*?*/ { @@ -886,7 +886,7 @@ using namespace ::rtl; /*?*/ SfxMedium aMed( rNm, STREAM_STD_READ, FALSE ); /*?*/ if( 0 == ( nErr = aMed.GetInStream()->GetError() ) ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwWait aWait( *this, sal_True ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwWait aWait( *this, sal_True ); //STRIP001 /*?*/ SwReader aRead( aMed, rNm, pDoc ); //STRIP001 /*?*/ nErr = aRead.Read( *ReadSwg ); /*?*/ } diff --git a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx index 64bba5f5f..da9e03baa 100644 --- a/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_docstyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_docstyle.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:53:58 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1182,7 +1182,7 @@ namespace binfilter { /*N*/ /*N*/ if( RES_CONDTXTFMTCOLL == pColl->Which() && pCondItem ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwFmt* pFindFmt; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwFmt* pFindFmt; //STRIP001 /*?*/ const CommandStruct* pCmds = SwCondCollItem::GetCmds(); //STRIP001 /*?*/ for(USHORT i = 0; i < COND_COMMAND_COUNT; i++) //STRIP001 /*?*/ { @@ -1205,7 +1205,7 @@ namespace binfilter { /*N*/ { /*?*/ // keine bedingte Vorlage, dann erstmal erzeugen und /*?*/ // alle wichtigen Werte uebernehmen -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwConditionTxtFmtColl* pCColl = rDoc.MakeCondTxtFmtColl( +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwConditionTxtFmtColl* pCColl = rDoc.MakeCondTxtFmtColl( //STRIP001 /*?*/ pColl->GetName(), (SwTxtFmtColl*)pColl->DerivedFrom() ); //STRIP001 /*?*/ if( pColl != &pColl->GetNextTxtFmtColl() ) //STRIP001 /*?*/ pCColl->SetNextTxtFmtColl( pColl->GetNextTxtFmtColl() ); @@ -1512,7 +1512,7 @@ namespace binfilter { /*N*/ bPhysical = 0 != pCharFmt; /*N*/ if( bFillOnlyInfo && !bPhysical ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; //STRIP001 /*?*/ ::lcl_SaveStyles( nFamily, aDelArr, rDoc ); //STRIP001 /*?*/ pCharFmt = lcl_FindCharFmt(rDoc, aName, this, TRUE ); /*N*/ } @@ -1539,7 +1539,7 @@ namespace binfilter { /*N*/ bPhysical = 0 != pColl; /*N*/ if( bFillOnlyInfo && !bPhysical ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; //STRIP001 /*?*/ ::lcl_SaveStyles( nFamily, aDelArr, rDoc ); //STRIP001 /*?*/ pColl = lcl_FindParaFmt(rDoc, aName, this, TRUE ); /*N*/ } @@ -1562,7 +1562,7 @@ namespace binfilter { /*N*/ bPhysical = 0 != pFrmFmt; /*N*/ if( bFillOnlyInfo && bPhysical ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; //STRIP001 /*?*/ ::lcl_SaveStyles( nFamily, aDelArr, rDoc ); //STRIP001 /*?*/ pFrmFmt = lcl_FindFrmFmt(rDoc, aName, this, TRUE ); /*N*/ } @@ -1581,7 +1581,7 @@ namespace binfilter { /*N*/ bPhysical = 0 != pDesc; /*N*/ if( bFillOnlyInfo && !pDesc ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; //STRIP001 /*?*/ ::lcl_SaveStyles( nFamily, aDelArr, rDoc ); //STRIP001 /*?*/ pDesc = lcl_FindPageDesc( rDoc, aName, this, TRUE ); /*N*/ } @@ -1609,7 +1609,7 @@ namespace binfilter { /*N*/ bPhysical = 0 != pNumRule; /*N*/ if( bFillOnlyInfo && !pNumRule ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 bDeleteInfo = TRUE; //STRIP001 /*?*/ ::lcl_SaveStyles( nFamily, aDelArr, rDoc ); //STRIP001 /*?*/ pNumRule = lcl_FindNumRule( rDoc, aName, this, TRUE ); /*N*/ } @@ -1674,7 +1674,7 @@ namespace binfilter { /*N*/ SetMask( nMask ); /*N*/ } /*N*/ if( bDeleteInfo && bFillOnlyInfo ) -/*?*/ { DBG_ASSERT(0, "STRIP"); }//STRIP001 ::lcl_DeleteInfoStyles( nFamily, aDelArr, rDoc ); +/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ::lcl_DeleteInfoStyles( nFamily, aDelArr, rDoc ); /*N*/ return bRet; /*N*/ } @@ -1701,7 +1701,7 @@ namespace binfilter { /*N*/ { /*N*/ SwTxtFmtColl *pPar = (*rDoc.GetTxtFmtColls())[0]; /*N*/ if( nMask & SWSTYLEBIT_CONDCOLL ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 pColl = rDoc.MakeCondTxtFmtColl( aName, pPar ); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 pColl = rDoc.MakeCondTxtFmtColl( aName, pPar ); /*N*/ else /*N*/ pColl = rDoc.MakeTxtFmtColl( aName, pPar ); /*N*/ } @@ -2206,7 +2206,7 @@ namespace binfilter { /*N*/ BOOL SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam, /*N*/ const String &rStyle, const String &rParent ) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 SwFmt* pFmt = 0, *pParent = 0; //STRIP001 switch( eFam ) //STRIP001 { @@ -2568,7 +2568,7 @@ namespace binfilter { /*N*/ bSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ; /*N*/ if ( bAll || (nSMask & ~SFXSTYLEBIT_USED) == SWSTYLEBIT_CONDCOLL ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( !bSearchUsed || +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( !bSearchUsed || //STRIP001 /*?*/ rDoc.IsPoolTxtCollUsed( RES_POOLCOLL_TEXT )) //STRIP001 /*?*/ aLst.Append( cPARA, *SwStyleNameMapper::GetTextUINameArray()[ //STRIP001 /*?*/ RES_POOLCOLL_TEXT - RES_POOLCOLL_TEXT_BEGIN ] ); @@ -2578,7 +2578,7 @@ namespace binfilter { /*N*/ (nSMask & ~SFXSTYLEBIT_USED) == /*N*/ (SWSTYLEBIT_HTML | SFXSTYLEBIT_USERDEF) ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 AppendStyleList(SwStyleNameMapper::GetHTMLUINameArray(), +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 AppendStyleList(SwStyleNameMapper::GetHTMLUINameArray(), //STRIP001 /*?*/ bSearchUsed, GET_POOLID_TXTCOLL, cPARA ) ; //STRIP001 /*?*/ if( !bAll ) //STRIP001 /*?*/ { @@ -2750,7 +2750,7 @@ namespace binfilter { /*N*/ { /*N*/ if( bTestUsed ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SwDoc& rDoc = ((SwDocStyleSheetPool*)pBasePool)->GetDoc(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SwDoc& rDoc = ((SwDocStyleSheetPool*)pBasePool)->GetDoc(); //STRIP001 /*?*/ for ( USHORT i=0; i < rList.Count(); ++i ) //STRIP001 /*?*/ { //STRIP001 /*?*/ BOOL bUsed = FALSE; @@ -2786,7 +2786,7 @@ namespace binfilter { /*N*/ if( rHint.ISA( SfxStyleSheetHint ) && /*N*/ SFX_STYLESHEET_ERASED == ((SfxStyleSheetHint&) rHint).GetHint() ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SfxStyleSheetBase* pStyle = ((SfxStyleSheetHint&)rHint).GetStyleSheet(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SfxStyleSheetBase* pStyle = ((SfxStyleSheetHint&)rHint).GetStyleSheet(); //STRIP001 /*?*/ //STRIP001 /*?*/ USHORT nTmpPos = lcl_FindName( aLst, pStyle->GetFamily(), //STRIP001 /*?*/ pStyle->GetName() ); diff --git a/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx b/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx index c6334b26e..79bbcff18 100644 --- a/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx +++ b/binfilter/bf_sw/source/ui/app/sw_swmodul1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swmodul1.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2004-02-25 09:54:01 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -411,7 +411,7 @@ using namespace ::com::sun::star::lang; /*M*/ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView, /*M*/ sal_uInt16 nDest ) -/*M*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*M*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ SwView* pView = pActView; //STRIP001 /*?*/ ViewShell* pSh = pView ? &pView->GetWrtShell() : 0; //STRIP001 /*?*/ @@ -601,7 +601,7 @@ using namespace ::com::sun::star::lang; /*N*/ sal_uInt16 SwModule::GetRedlineAuthor() /*N*/ { -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 if (!bAuthorInitialised) +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 if (!bAuthorInitialised) //STRIP001 { //STRIP001 SvtUserOptions aOpt; //STRIP001 if( !(sActAuthor = aOpt.GetFullName()).Len() ) diff --git a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx index aa2248155..88ba44ba5 100644 --- a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx +++ b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_viewopt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:54:13 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -623,7 +623,7 @@ static const char __FAR_DATA aPostItStr[] = " "; /*N*/ { /*N*/ USHORT nRet = 0; /*N*/ if(!pShell || PTR_CAST(SwWebDocShell, pShell)) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ nRet = HTMLMODE_ON; //STRIP001 /*?*/ OfaHtmlOptions* pHtmlOpt = OFF_APP()->GetHtmlOptions(); //STRIP001 /*?*/ switch ( pHtmlOpt->GetExportMode() ) @@ -839,7 +839,7 @@ static const char __FAR_DATA aPostItStr[] = " "; ---------------------------------------------------------------------------*/ /*N*/ void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, BOOL bSet, BOOL bSaveInConfig ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*?*/ if(bSet) //STRIP001 /*?*/ nAppearanceFlags |= nFlag; //STRIP001 /*?*/ else diff --git a/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx b/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx index f42b3bbf0..b0a26bdae 100644 --- a/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx +++ b/binfilter/bf_sw/source/ui/dbui/sw_dbmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_dbmgr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:54:15 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -423,7 +423,7 @@ namespace --------------------------------------------------------------------*/ /*N*/ BOOL SwNewDBMgr::MergeNew(USHORT nOpt, SwWrtShell& rSh, /*N*/ const ODataAccessDescriptor& _rDescriptor) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 /*?*/ SetMergeType( nOpt ); //STRIP001 /*?*/ //STRIP001 /*?*/ DBG_ASSERT(!bInMerge && !pImpl->pMergeData, "merge already activated!") @@ -1950,7 +1950,7 @@ namespace ---------------------------------------------------------------------------*/ /*N*/ sal_Bool SwNewDBMgr::ToRecordId(sal_Int32 nSet) -/*N*/ {DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 //STRIP001 /*?*/ DBG_ASSERT(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge") //STRIP001 /*?*/ if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()|| nSet < 0) //STRIP001 /*?*/ return FALSE; @@ -2269,7 +2269,7 @@ namespace /*N*/ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, /*N*/ const Sequence<PropertyValue>& rProperties, /*N*/ BOOL bWithDataSourceBrowser) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 //prevent second call //STRIP001 if(pImpl->pMergeDialog) //STRIP001 return ; @@ -2329,7 +2329,7 @@ namespace /*N*/ void SwNewDBMgr::InsertText(SwWrtShell& rSh, /*N*/ const Sequence< PropertyValue>& rProperties) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ::rtl::OUString sDataSource, sDataTableOrQuery; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ::rtl::OUString sDataSource, sDataTableOrQuery; //STRIP001 /*?*/ Reference<XResultSet> xResSet; //STRIP001 /*?*/ Sequence<Any> aSelection; //STRIP001 /*?*/ BOOL bHasSelectionProperty = FALSE; diff --git a/binfilter/bf_sw/source/ui/dochdl/sw_swdtflvr.cxx b/binfilter/bf_sw/source/ui/dochdl/sw_swdtflvr.cxx index e05ac173e..ae9c1fc3a 100644 --- a/binfilter/bf_sw/source/ui/dochdl/sw_swdtflvr.cxx +++ b/binfilter/bf_sw/source/ui/dochdl/sw_swdtflvr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_swdtflvr.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mwu $ $Date: 2003-11-20 04:58:57 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1614,7 +1614,7 @@ using namespace ::com::sun::star::datatransfer; /*N*/ ObjCntType eOType; /*N*/ if( pPt ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 SdrObject *pObj = 0; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 SdrObject *pObj = 0; //STRIP001 /*?*/ eOType = rSh.GetObjCntType( *pPt, pObj ); /*N*/ } /*N*/ else @@ -1624,7 +1624,7 @@ using namespace ::com::sun::star::datatransfer; /*N*/ { /*N*/ case OBJCNT_GRF: /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 BOOL bIMap, bLink; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bIMap, bLink; //STRIP001 /*?*/ if( pPt ) //STRIP001 /*?*/ { //STRIP001 /*?*/ bIMap = 0 != rSh.GetFmtFromObj( *pPt )->GetURL().GetMap(); diff --git a/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx b/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx index cd1e44d9a..8432d8c72 100644 --- a/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx +++ b/binfilter/bf_sw/source/ui/envelp/sw_envimg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_envimg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:54:26 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -164,7 +164,7 @@ using namespace ::com::sun::star::uno; /*N*/ SwEnvItem::SwEnvItem() : /*N*/ SfxPoolItem(FN_ENVELOP) /*N*/ { -/*N*/ DBG_ASSERT(0, "STRIP"); //STRIP001 aAddrText = aEmptyStr; +/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aAddrText = aEmptyStr; //STRIP001 bSend = TRUE; //STRIP001 aSendText = MakeSender(); //STRIP001 lSendFromLeft = 566; // 1 cm @@ -195,7 +195,7 @@ using namespace ::com::sun::star::uno; /*N*/ bPrintFromAbove(rItem.bPrintFromAbove), /*N*/ lShiftRight (rItem.lShiftRight), /*N*/ lShiftDown (rItem.lShiftDown) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*N*/ } // -------------------------------------------------------------------------- @@ -219,7 +219,7 @@ using namespace ::com::sun::star::uno; // -------------------------------------------------------------------------- /*N*/ int SwEnvItem::operator ==(const SfxPoolItem& rItem) const /*N*/ { -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 const SwEnvItem& rEnv = (const SwEnvItem&) rItem; +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 const SwEnvItem& rEnv = (const SwEnvItem&) rItem; //STRIP001 //STRIP001 return aAddrText == rEnv.aAddrText && //STRIP001 bSend == rEnv.bSend && diff --git a/binfilter/bf_sw/source/ui/inc/basesh.hxx b/binfilter/bf_sw/source/ui/inc/basesh.hxx index 0209f59ff..ef7f24b61 100644 --- a/binfilter/bf_sw/source/ui/inc/basesh.hxx +++ b/binfilter/bf_sw/source/ui/inc/basesh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: basesh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:54:52 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -135,39 +135,39 @@ public: SFX_DECL_INTERFACE(SW_BASESHELL); TYPEINFO(); - void ExecDelete(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecDelete(SfxRequest &); + void ExecDelete(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecDelete(SfxRequest &); - void ExecClpbrd(SfxRequest &){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecClpbrd(SfxRequest &); + void ExecClpbrd(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecClpbrd(SfxRequest &); void StateClpbrd(SfxItemSet &); - void ExecUndo(SfxRequest &){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecUndo(SfxRequest &); + void ExecUndo(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecUndo(SfxRequest &); void StateUndo(SfxItemSet &); - void Execute(SfxRequest &){DBG_ASSERT(0, "STRIP");}; //STRIP001 void Execute(SfxRequest &); + void Execute(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void Execute(SfxRequest &); void GetState(SfxItemSet &); void StateStyle(SfxItemSet &); - void ExecuteGallery(SfxRequest&){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecuteGallery(SfxRequest&); - void GetGalleryState(SfxItemSet&){DBG_ASSERT(0, "STRIP");}; //STRIP001 void GetGalleryState(SfxItemSet&); + void ExecuteGallery(SfxRequest&){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecuteGallery(SfxRequest&); + void GetGalleryState(SfxItemSet&){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void GetGalleryState(SfxItemSet&); - void ExecDlg(SfxRequest &){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecDlg(SfxRequest &); + void ExecDlg(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecDlg(SfxRequest &); void StateStatusLine(SfxItemSet &rSet); - void ExecTxtCtrl(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecTxtCtrl(SfxRequest& rReq); + void ExecTxtCtrl(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecTxtCtrl(SfxRequest& rReq); void GetTxtFontCtrlState(SfxItemSet& rSet); void GetTxtCtrlState(SfxItemSet& rSet); - void GetBorderState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");}; //STRIP001 void GetBorderState(SfxItemSet &rSet); + void GetBorderState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void GetBorderState(SfxItemSet &rSet); void GetBckColState(SfxItemSet &rSet); - void ExecBckCol(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecBckCol(SfxRequest& rReq); + void ExecBckCol(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecBckCol(SfxRequest& rReq); void SetWrapMode( USHORT nSlot ); - void StateDisableItems(SfxItemSet &){DBG_ASSERT(0, "STRIP");};//STRIP001 void StateDisableItems(SfxItemSet &); + void StateDisableItems(SfxItemSet &){DBG_BF_ASSERT(0, "STRIP");};//STRIP001 void StateDisableItems(SfxItemSet &); - void EditRegionDialog(SfxRequest& rReq){DBG_ASSERT(0, "STRIP"); };//STRIP001 void EditRegionDialog(SfxRequest& rReq); - void InsertRegionDialog(SfxRequest& rReq){DBG_ASSERT(0, "STRIP"); };//STRIP001 void InsertRegionDialog(SfxRequest& rReq); + void EditRegionDialog(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP"); };//STRIP001 void EditRegionDialog(SfxRequest& rReq); + void InsertRegionDialog(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP"); };//STRIP001 void InsertRegionDialog(SfxRequest& rReq); - void ExecField(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecField(SfxRequest& rReq); + void ExecField(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecField(SfxRequest& rReq); //STRIP001 static void SetFrmMode( USHORT nMode, SwWrtShell *pShell ); //Mit Update! static void _SetFrmMode( USHORT nMode ) { nFrameMode = nMode; } diff --git a/binfilter/bf_sw/source/ui/inc/chldwrap.hxx b/binfilter/bf_sw/source/ui/inc/chldwrap.hxx index d5bd83ee4..29db598fd 100644 --- a/binfilter/bf_sw/source/ui/inc/chldwrap.hxx +++ b/binfilter/bf_sw/source/ui/inc/chldwrap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chldwrap.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:54:55 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ class SwChildWinWrapper : public SfxChildWindow // Implementation in fldtdlg.cxx protected: - SwChildWinWrapper(Window *pParentWindow, USHORT nId):SfxChildWindow(pParentWindow, nId){DBG_ASSERT(0, "STRIP");} //STRIP001 SwChildWinWrapper(Window *pParentWindow, USHORT nId); + SwChildWinWrapper(Window *pParentWindow, USHORT nId):SfxChildWindow(pParentWindow, nId){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SwChildWinWrapper(Window *pParentWindow, USHORT nId); //STRIP001 public: //STRIP001 virtual BOOL ReInitDlg(SwDocShell *pDocSh); diff --git a/binfilter/bf_sw/source/ui/inc/drawsh.hxx b/binfilter/bf_sw/source/ui/inc/drawsh.hxx index 47b3cc300..7a4235db2 100644 --- a/binfilter/bf_sw/source/ui/inc/drawsh.hxx +++ b/binfilter/bf_sw/source/ui/inc/drawsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drawsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,16 +74,16 @@ public: SFX_DECL_INTERFACE(SW_DRAWSHELL); //STRIP001 TYPEINFO(); - SwDrawShell(SwView &rView):SwDrawBaseShell(rView){DBG_ASSERT(0, "STRIP");} ;//STRIP001 SwDrawShell(SwView &rView); + SwDrawShell(SwView &rView):SwDrawBaseShell(rView){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 SwDrawShell(SwView &rView); - void Execute(SfxRequest &){DBG_ASSERT(0, "STRIP");}; //STRIP001 void Execute(SfxRequest &); + void Execute(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void Execute(SfxRequest &); //STRIP001 void GetState(SfxItemSet &); - void ExecDrawDlg(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecDrawDlg(SfxRequest& rReq); - void ExecDrawAttrArgs(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecDrawAttrArgs(SfxRequest& rReq); - void GetDrawAttrState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");}; //STRIP001 void GetDrawAttrState(SfxItemSet &rSet); + void ExecDrawDlg(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecDrawDlg(SfxRequest& rReq); + void ExecDrawAttrArgs(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecDrawAttrArgs(SfxRequest& rReq); + void GetDrawAttrState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void GetDrawAttrState(SfxItemSet &rSet); - void ExecFormText(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecFormText(SfxRequest& rReq); - void GetFormTextState(SfxItemSet& rSet){DBG_ASSERT(0, "STRIP");}; //STRIP001 void GetFormTextState(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecFormText(SfxRequest& rReq); + void GetFormTextState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void GetFormTextState(SfxItemSet& rSet); }; } //namespace binfilter diff --git a/binfilter/bf_sw/source/ui/inc/drformsh.hxx b/binfilter/bf_sw/source/ui/inc/drformsh.hxx index e0ec990c2..752321b71 100644 --- a/binfilter/bf_sw/source/ui/inc/drformsh.hxx +++ b/binfilter/bf_sw/source/ui/inc/drformsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drformsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ public: SFX_DECL_INTERFACE(SW_DRAWFORMSHELL); //STRIP001 TYPEINFO(); - SwDrawFormShell(SwView &rView):SwDrawBaseShell(rView){DBG_ASSERT(0, "STRIP");} ;//STRIP001 SwDrawFormShell(SwView &rView); + SwDrawFormShell(SwView &rView):SwDrawBaseShell(rView){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 SwDrawFormShell(SwView &rView); //STRIP001 virtual ~SwDrawFormShell(); //STRIP001 void Execute(SfxRequest &); diff --git a/binfilter/bf_sw/source/ui/inc/drwbassh.hxx b/binfilter/bf_sw/source/ui/inc/drwbassh.hxx index 76086e072..d26af413e 100644 --- a/binfilter/bf_sw/source/ui/inc/drwbassh.hxx +++ b/binfilter/bf_sw/source/ui/inc/drwbassh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drwbassh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:09 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ class SwDrawBaseShell: public SwBaseShell //STRIP001 DECL_LINK( CheckGroupShapeNameHdl, SvxNameDialog* ); public: - SwDrawBaseShell(SwView &rShell):SwBaseShell( rShell ){DBG_ASSERT(0, "STRIP");} //STRIP001 SwDrawBaseShell(SwView &rShell); + SwDrawBaseShell(SwView &rShell):SwBaseShell( rShell ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SwDrawBaseShell(SwView &rShell); //STRIP001 virtual ~SwDrawBaseShell(); SFX_DECL_INTERFACE(SW_DRAWBASESHELL); @@ -89,7 +89,7 @@ public: //STRIP001 void Execute(SfxRequest &); //STRIP001 void GetState(SfxItemSet &); - void DisableState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");}; //STRIP001 void DisableState(SfxItemSet &rSet) { Disable(rSet);} + void DisableState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void DisableState(SfxItemSet &rSet) { Disable(rSet);} //STRIP001 BOOL Disable(SfxItemSet& rSet, USHORT nWhich = 0); //STRIP001 void StateStatusline(SfxItemSet &rSet); diff --git a/binfilter/bf_sw/source/ui/inc/drwtxtsh.hxx b/binfilter/bf_sw/source/ui/inc/drwtxtsh.hxx index 7294228e0..6cad9321a 100644 --- a/binfilter/bf_sw/source/ui/inc/drwtxtsh.hxx +++ b/binfilter/bf_sw/source/ui/inc/drwtxtsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drwtxtsh.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-05-04 15:02:00 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,24 +99,24 @@ public: SwDrawTextShell(SwView &rView); //STRIP001 virtual ~SwDrawTextShell(); - void StateDisableItems(SfxItemSet &){DBG_ASSERT(0, "STRIP");}; //STRIP001 void StateDisableItems(SfxItemSet &); + void StateDisableItems(SfxItemSet &){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void StateDisableItems(SfxItemSet &); - void Execute(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void Execute(SfxRequest &); - void ExecDraw(SfxRequest &){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecDraw(SfxRequest &); - void GetState(SfxItemSet &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void GetState(SfxItemSet &); - void GetDrawTxtCtrlState(SfxItemSet&){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void GetDrawTxtCtrlState(SfxItemSet&); + void Execute(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void Execute(SfxRequest &); + void ExecDraw(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecDraw(SfxRequest &); + void GetState(SfxItemSet &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void GetState(SfxItemSet &); + void GetDrawTxtCtrlState(SfxItemSet&){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void GetDrawTxtCtrlState(SfxItemSet&); - void ExecFontWork(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecFontWork(SfxRequest& rReq); - void StateFontWork(SfxItemSet& rSet){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void StateFontWork(SfxItemSet& rSet); - void ExecFormText(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecFormText(SfxRequest& rReq); - void GetFormTextState(SfxItemSet& rSet){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void GetFormTextState(SfxItemSet& rSet); - void ExecDrawLingu(SfxRequest &rReq){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecDrawLingu(SfxRequest &rReq); - void ExecUndo(SfxRequest &rReq){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecUndo(SfxRequest &rReq); - void StateUndo(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");}; //STRIP001 void StateUndo(SfxItemSet &rSet); - void ExecClpbrd(SfxRequest &rReq){DBG_ASSERT(0, "STRIP");}; //STRIP001 void ExecClpbrd(SfxRequest &rReq); - void StateClpbrd(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");}; //STRIP001 void StateClpbrd(SfxItemSet &rSet); - void StateInsert(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void StateInsert(SfxItemSet &rSet); - void ExecTransliteration(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecTransliteration(SfxRequest &); + void ExecFontWork(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecFontWork(SfxRequest& rReq); + void StateFontWork(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void StateFontWork(SfxItemSet& rSet); + void ExecFormText(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecFormText(SfxRequest& rReq); + void GetFormTextState(SfxItemSet& rSet){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void GetFormTextState(SfxItemSet& rSet); + void ExecDrawLingu(SfxRequest &rReq){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecDrawLingu(SfxRequest &rReq); + void ExecUndo(SfxRequest &rReq){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecUndo(SfxRequest &rReq); + void StateUndo(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void StateUndo(SfxItemSet &rSet); + void ExecClpbrd(SfxRequest &rReq){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void ExecClpbrd(SfxRequest &rReq); + void StateClpbrd(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 void StateClpbrd(SfxItemSet &rSet); + void StateInsert(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void StateInsert(SfxItemSet &rSet); + void ExecTransliteration(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecTransliteration(SfxRequest &); //STRIP001 void Init(); //STRIP001 void StateStatusline(SfxItemSet &rSet); diff --git a/binfilter/bf_sw/source/ui/inc/fldwrap.hxx b/binfilter/bf_sw/source/ui/inc/fldwrap.hxx index f7029f132..5645e8e9d 100644 --- a/binfilter/bf_sw/source/ui/inc/fldwrap.hxx +++ b/binfilter/bf_sw/source/ui/inc/fldwrap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fldwrap.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:12 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,7 @@ class SwFldDlgWrapper : public SwChildWinWrapper { public: SwFldDlgWrapper( Window* pParent, USHORT nId, - SfxBindings* pBindings, SfxChildWinInfo* pInfo ): SwChildWinWrapper( pParent, nId ){DBG_ASSERT(0, "STRIP");} //STRIP001 SfxBindings* pBindings, SfxChildWinInfo* pInfo ); + SfxBindings* pBindings, SfxChildWinInfo* pInfo ): SwChildWinWrapper( pParent, nId ){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SwFldDlgWrapper); diff --git a/binfilter/bf_sw/source/ui/inc/frmsh.hxx b/binfilter/bf_sw/source/ui/inc/frmsh.hxx index 72a1953ba..9ee90cf2c 100644 --- a/binfilter/bf_sw/source/ui/inc/frmsh.hxx +++ b/binfilter/bf_sw/source/ui/inc/frmsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frmsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:14 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,14 +70,14 @@ class SwFrameShell: public SwBaseShell public: SFX_DECL_INTERFACE(SW_FRAMESHELL); - SwFrameShell(SwView &rView):SwBaseShell( rView ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 SwFrameShell(SwView &rView); + SwFrameShell(SwView &rView):SwBaseShell( rView ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 SwFrameShell(SwView &rView); //STRIP001 virtual ~SwFrameShell(); //STRIP001 void Execute(SfxRequest &); //STRIP001 void GetState(SfxItemSet &); - void ExecFrameStyle(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecFrameStyle(SfxRequest& rReq); - void GetLineStyleState(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void GetLineStyleState(SfxItemSet &rSet); - void StateInsert(SfxItemSet &rSet){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void StateInsert(SfxItemSet &rSet); + void ExecFrameStyle(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecFrameStyle(SfxRequest& rReq); + void GetLineStyleState(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void GetLineStyleState(SfxItemSet &rSet); + void StateInsert(SfxItemSet &rSet){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void StateInsert(SfxItemSet &rSet); //STRIP001 //STRIP001 void StateStatusline(SfxItemSet &rSet); //STRIP001 diff --git a/binfilter/bf_sw/source/ui/inc/glosdoc.hxx b/binfilter/bf_sw/source/ui/inc/glosdoc.hxx index 0875603f6..73f53c18b 100644 --- a/binfilter/bf_sw/source/ui/inc/glosdoc.hxx +++ b/binfilter/bf_sw/source/ui/inc/glosdoc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: glosdoc.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:15 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,7 +117,7 @@ class SwGlossaries SvStrings *pGlosArr; BOOL bError; //STRIP001 - SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const{DBG_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 //STRIP001 SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const; + SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 //STRIP001 SwTextBlocks* GetGlosDoc(const String &rName, BOOL bCreate = TRUE) const; SvStrings *GetNameList(); //STRIP001 // implementation in unoatxt.cxx void RemoveFileFromList( const String& rGroup ); diff --git a/binfilter/bf_sw/source/ui/inc/grfsh.hxx b/binfilter/bf_sw/source/ui/inc/grfsh.hxx index 4e4a089d8..2fbe6549b 100644 --- a/binfilter/bf_sw/source/ui/inc/grfsh.hxx +++ b/binfilter/bf_sw/source/ui/inc/grfsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: grfsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:16 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,10 +70,10 @@ public: SFX_DECL_INTERFACE(SW_GRFSHELL); //STRIP001 void Execute(SfxRequest &); - void ExecAttr(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecAttr(SfxRequest &); - void GetAttrState(SfxItemSet &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void GetAttrState(SfxItemSet &); + void ExecAttr(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecAttr(SfxRequest &); + void GetAttrState(SfxItemSet &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void GetAttrState(SfxItemSet &); - SwGrfShell(SwView &rView):SwBaseShell(rView){DBG_ASSERT(0, "STRIP");} ;//STRIP001 SwGrfShell(SwView &rView); + SwGrfShell(SwView &rView):SwBaseShell(rView){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 SwGrfShell(SwView &rView); }; } //namespace binfilter diff --git a/binfilter/bf_sw/source/ui/inc/hdftctrl.hxx b/binfilter/bf_sw/source/ui/inc/hdftctrl.hxx index b036d1200..f70ed4ae6 100644 --- a/binfilter/bf_sw/source/ui/inc/hdftctrl.hxx +++ b/binfilter/bf_sw/source/ui/inc/hdftctrl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: hdftctrl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:17 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,7 +89,7 @@ public: SFX_DECL_MENU_CONTROL(); SwHeadFootMenuControl( USHORT nPos, Menu& rMenu, //STRIP001 SwHeadFootMenuControl( USHORT nPos, Menu& rMenu, - SfxBindings& rBindings ){DBG_ASSERT(0, "STRIP");}; //STRIP001 SfxBindings& rBindings ); + SfxBindings& rBindings ){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 SfxBindings& rBindings ); //STRIP001 virtual ~SwHeadFootMenuControl(); //STRIP001 virtual PopupMenu* GetPopup() const; //STRIP001 diff --git a/binfilter/bf_sw/source/ui/inc/pview.hxx b/binfilter/bf_sw/source/ui/inc/pview.hxx index 1fd7f0129..81647bb29 100644 --- a/binfilter/bf_sw/source/ui/inc/pview.hxx +++ b/binfilter/bf_sw/source/ui/inc/pview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pview.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:34 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -318,9 +318,9 @@ public: //STRIP001 void SetNewPage(USHORT nSet) {nNewPage = nSet;} // Handler - void Execute(SfxRequest&){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void Execute(SfxRequest&); - void GetState(SfxItemSet&){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void GetState(SfxItemSet&); - void StateUndo(SfxItemSet&){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void StateUndo(SfxItemSet&); + void Execute(SfxRequest&){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void Execute(SfxRequest&); + void GetState(SfxItemSet&){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void GetState(SfxItemSet&); + void StateUndo(SfxItemSet&){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void StateUndo(SfxItemSet&); SwDocShell* GetDocShell(); diff --git a/binfilter/bf_sw/source/ui/inc/redlndlg.hxx b/binfilter/bf_sw/source/ui/inc/redlndlg.hxx index ec72b2892..79ee89845 100644 --- a/binfilter/bf_sw/source/ui/inc/redlndlg.hxx +++ b/binfilter/bf_sw/source/ui/inc/redlndlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: redlndlg.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:35 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ class SwChildWinWrapper; class SwRedlineAcceptChild : public SwChildWinWrapper { public: - SwRedlineAcceptChild( Window* pParent,USHORT nId, SfxBindings*, SfxChildWinInfo* ):SwChildWinWrapper( pParent, nId ){DBG_ASSERT(0, "STRIP");}; //STRIP001 SwRedlineAcceptChild( Window* , + SwRedlineAcceptChild( Window* pParent,USHORT nId, SfxBindings*, SfxChildWinInfo* ):SwChildWinWrapper( pParent, nId ){DBG_BF_ASSERT(0, "STRIP");}; //STRIP001 SwRedlineAcceptChild( Window* , //STRIP001 USHORT nId, //STRIP001 SfxBindings*, //STRIP001 SfxChildWinInfo* ); diff --git a/binfilter/bf_sw/source/ui/inc/tabsh.hxx b/binfilter/bf_sw/source/ui/inc/tabsh.hxx index 1197e92e8..5b7094cd0 100644 --- a/binfilter/bf_sw/source/ui/inc/tabsh.hxx +++ b/binfilter/bf_sw/source/ui/inc/tabsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tabsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:43 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,9 +74,9 @@ public: void GetState(SfxItemSet &); void GetFrmBorderState(SfxItemSet &rSet); void GetLineStyleState(SfxItemSet &rSet); - void ExecTableStyle(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecTableStyle(SfxRequest& rReq); + void ExecTableStyle(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecTableStyle(SfxRequest& rReq); - void ExecNumberFormat(SfxRequest& rReq){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecNumberFormat(SfxRequest& rReq); + void ExecNumberFormat(SfxRequest& rReq){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecNumberFormat(SfxRequest& rReq); SwTableShell(SwView &rView); }; diff --git a/binfilter/bf_sw/source/ui/inc/textsh.hxx b/binfilter/bf_sw/source/ui/inc/textsh.hxx index e9afa870f..3d26f06ee 100644 --- a/binfilter/bf_sw/source/ui/inc/textsh.hxx +++ b/binfilter/bf_sw/source/ui/inc/textsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: textsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:45 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,29 +93,29 @@ public: //STRIP001 void Execute(SfxRequest &); void GetState(SfxItemSet &); - void ExecInsert(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecInsert(SfxRequest &); + void ExecInsert(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecInsert(SfxRequest &); void StateInsert(SfxItemSet&); //STRIP001 void ExecDelete(SfxRequest &); - void ExecEnterNum(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecEnterNum(SfxRequest &); - void ExecBasicMove(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecBasicMove(SfxRequest &); - void ExecMove(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMove(SfxRequest &); - void ExecMovePage(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMovePage(SfxRequest &); - void ExecMoveCol(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMoveCol(SfxRequest &); - void ExecMoveLingu(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMoveLingu(SfxRequest &); - void ExecMoveMisc(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMoveMisc(SfxRequest &); + void ExecEnterNum(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecEnterNum(SfxRequest &); + void ExecBasicMove(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecBasicMove(SfxRequest &); + void ExecMove(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMove(SfxRequest &); + void ExecMovePage(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMovePage(SfxRequest &); + void ExecMoveCol(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMoveCol(SfxRequest &); + void ExecMoveLingu(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMoveLingu(SfxRequest &); + void ExecMoveMisc(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecMoveMisc(SfxRequest &); //STRIP001 void ExecField(SfxRequest &rReq); void StateField(SfxItemSet &); - void ExecIdx(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecIdx(SfxRequest &); + void ExecIdx(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecIdx(SfxRequest &); void GetIdxState(SfxItemSet &); void ExecGlossary(SfxRequest &);//STRIP001 void ExecGlossary(SfxRequest &); - void ExecCharAttr(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecCharAttr(SfxRequest &); - void ExecCharAttrArgs(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecCharAttrArgs(SfxRequest &); - void ExecParaAttr(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecParaAttr(SfxRequest &); - void ExecParaAttrArgs(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecParaAttrArgs(SfxRequest &); + void ExecCharAttr(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecCharAttr(SfxRequest &); + void ExecCharAttrArgs(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecCharAttrArgs(SfxRequest &); + void ExecParaAttr(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecParaAttr(SfxRequest &); + void ExecParaAttrArgs(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecParaAttrArgs(SfxRequest &); void ExecAttr(SfxRequest &); - void ExecDB(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecDB(SfxRequest &); - void ExecTransliteration(SfxRequest &){DBG_ASSERT(0, "STRIP");} ;//STRIP001 void ExecTransliteration(SfxRequest &); + void ExecDB(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecDB(SfxRequest &); + void ExecTransliteration(SfxRequest &){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 void ExecTransliteration(SfxRequest &); void GetAttrState(SfxItemSet &); diff --git a/binfilter/bf_sw/source/ui/inc/uinums.hxx b/binfilter/bf_sw/source/ui/inc/uinums.hxx index 554b38d8f..b9a3b6e3d 100644 --- a/binfilter/bf_sw/source/ui/inc/uinums.hxx +++ b/binfilter/bf_sw/source/ui/inc/uinums.hxx @@ -2,9 +2,9 @@ * * $RCSfile: uinums.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:47 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,8 +160,8 @@ class SwChapterNumRules //STRIP001 : public SwBaseNumRules { public: - SwChapterNumRules(){DBG_ASSERT(0, "STRIP");} //STRIP001 SwChapterNumRules(); - virtual ~SwChapterNumRules(){DBG_ASSERT(0, "STRIP");} //STRIP001 virtual ~SwChapterNumRules(); + SwChapterNumRules(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 SwChapterNumRules(); + virtual ~SwChapterNumRules(){DBG_BF_ASSERT(0, "STRIP");} //STRIP001 virtual ~SwChapterNumRules(); //STRIP001 virtual void ApplyNumRules( const SwNumRulesWithName &rCopy, //STRIP001 USHORT nIdx); diff --git a/binfilter/bf_sw/source/ui/inc/uivwimp.hxx b/binfilter/bf_sw/source/ui/inc/uivwimp.hxx index 3f93be965..fe26adea6 100644 --- a/binfilter/bf_sw/source/ui/inc/uivwimp.hxx +++ b/binfilter/bf_sw/source/ui/inc/uivwimp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: uivwimp.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:48 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,7 +133,7 @@ class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< SwView* pView; // XEventListener - virtual void SAL_CALL disposing( const STAR_NMSPC::lang::EventObject& rEventObject )throw ( ::com::sun::star::uno::RuntimeException ){DBG_ASSERT(0, "STRIP");} ;//STRIP001 virtual void SAL_CALL disposing( const STAR_NMSPC::lang::EventObject& rEventObject ) + virtual void SAL_CALL disposing( const STAR_NMSPC::lang::EventObject& rEventObject )throw ( ::com::sun::star::uno::RuntimeException ){DBG_BF_ASSERT(0, "STRIP");} ;//STRIP001 virtual void SAL_CALL disposing( const STAR_NMSPC::lang::EventObject& rEventObject ) //STRIP001 throw ( ::com::sun::star::uno::RuntimeException ); // XClipboardListener diff --git a/binfilter/bf_sw/source/ui/inc/wrtsh.hxx b/binfilter/bf_sw/source/ui/inc/wrtsh.hxx index 8dd8d0bc0..85f61b0ca 100644 --- a/binfilter/bf_sw/source/ui/inc/wrtsh.hxx +++ b/binfilter/bf_sw/source/ui/inc/wrtsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtsh.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:55:52 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -592,7 +592,7 @@ private: inline void SwWrtShell::ResetCursorStack() { if ( HasCrsrStack() ) - {DBG_ASSERT(0, "STRIP"); }//STRIP001 _ResetCursorStack(); + {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 _ResetCursorStack(); } inline void SwWrtShell::SelTblCells(const Link &rLink, BOOL bMark ) diff --git a/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx b/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx index def4f2a35..ef479ce44 100644 --- a/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx +++ b/binfilter/bf_sw/source/ui/utlui/sw_attrdesc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_attrdesc.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:58:08 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -175,7 +175,7 @@ namespace binfilter { /*N*/ SfxMapUnit ePresMetric, /*N*/ String &rText ) const /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 static sal_Char __READONLY_DATA sKomma[] = ", "; +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 static sal_Char __READONLY_DATA sKomma[] = ", "; //STRIP001 //STRIP001 rText.Erase(); //STRIP001 String aStr; @@ -221,7 +221,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 static sal_Char __READONLY_DATA sKomma[] = ", /*N*/ String& rText, /*N*/ const IntlWrapper* pIntl /*N*/ ) const -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 switch ( ePres ) //STRIP001 { //STRIP001 case SFX_ITEM_PRESENTATION_NONE: diff --git a/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx b/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx index 00bf54d41..07ae3b1af 100644 --- a/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx +++ b/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_uitool.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:58:18 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -466,7 +466,7 @@ namespace binfilter { /*N*/ const SfxPoolItem *pBoxInfo; /*N*/ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER, /*N*/ TRUE, &pBoxInfo) ) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo; +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo; /*N*/ /*N*/ aBoxInfo.SetTable( FALSE ); /*N*/ // Abstandsfeld immer anzeigen diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_move.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_move.cxx index 895bb2b09..94654b9b7 100644 --- a/binfilter/bf_sw/source/ui/wrtsh/sw_move.cxx +++ b/binfilter/bf_sw/source/ui/wrtsh/sw_move.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_move.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:58:55 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -156,7 +156,7 @@ const long nReadOnlyScrollOfst = 10; /*N*/ FASTBOOL SwWrtShell::Left( USHORT nMode, FASTBOOL bSelect, /*N*/ USHORT nCount, BOOL bBasicCall, BOOL bVisual ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly()) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly()) //STRIP001 /*?*/ { //STRIP001 /*?*/ Point aTmp( VisArea().Pos() ); //STRIP001 /*?*/ aTmp.X() -= VisArea().Width() * nReadOnlyScrollOfst / 100; @@ -175,7 +175,7 @@ const long nReadOnlyScrollOfst = 10; /*N*/ FASTBOOL SwWrtShell::Right( USHORT nMode, FASTBOOL bSelect, /*N*/ USHORT nCount, BOOL bBasicCall, BOOL bVisual ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ Point aTmp( VisArea().Pos() ); //STRIP001 /*?*/ aTmp.X() += VisArea().Width() * nReadOnlyScrollOfst / 100; @@ -194,7 +194,7 @@ const long nReadOnlyScrollOfst = 10; /*N*/ FASTBOOL SwWrtShell::Up( FASTBOOL bSelect, USHORT nCount, BOOL bBasicCall ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly()) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly()) //STRIP001 /*?*/ { //STRIP001 /*?*/ Point aTmp( VisArea().Pos() ); //STRIP001 /*?*/ aTmp.Y() -= VisArea().Height() * nReadOnlyScrollOfst / 100; @@ -212,7 +212,7 @@ const long nReadOnlyScrollOfst = 10; /*N*/ FASTBOOL SwWrtShell::Down( FASTBOOL bSelect, USHORT nCount, BOOL bBasicCall ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly()) +DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() && !GetViewOptions()->IsSelectionInReadonly()) //STRIP001 { //STRIP001 Point aTmp( VisArea().Pos() ); //STRIP001 aTmp.Y() += VisArea().Height() * nReadOnlyScrollOfst / 100; @@ -231,7 +231,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*N*/ FASTBOOL SwWrtShell::LeftMargin( FASTBOOL bSelect, FASTBOOL bBasicCall ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ Point aTmp( VisArea().Pos() ); //STRIP001 /*?*/ aTmp.X() = DOCUMENTBORDER; @@ -249,7 +249,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*N*/ FASTBOOL SwWrtShell::RightMargin( FASTBOOL bSelect, FASTBOOL bBasicCall ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasicCall && IsCrsrReadonly() ) //STRIP001 /*?*/ { //STRIP001 /*?*/ Point aTmp( VisArea().Pos() ); //STRIP001 /*?*/ aTmp.X() = GetDocSize().Width() - VisArea().Width() + DOCUMENTBORDER; @@ -367,7 +367,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*N*/ FASTBOOL SwWrtShell::SttDoc( FASTBOOL bSelect ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); //STRIP001 /*?*/ return GoStart(FALSE, 0, bSelect ); /*N*/ } @@ -375,14 +375,14 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*N*/ FASTBOOL SwWrtShell::EndDoc( FASTBOOL bSelect) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); //STRIP001 /*?*/ return GoEnd(); /*N*/ } /*N*/ FASTBOOL SwWrtShell::SttNxtPg( FASTBOOL bSelect ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); //STRIP001 /*?*/ return MovePage( fnPageNext, fnPageStart ); /*N*/ } @@ -406,7 +406,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*N*/ FASTBOOL SwWrtShell::EndPrvPg( FASTBOOL bSelect ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); //STRIP001 /*?*/ return MovePage( fnPagePrev, fnPageEnd ); /*N*/ } @@ -414,7 +414,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*N*/ FASTBOOL SwWrtShell::SttPg( FASTBOOL bSelect ) /*N*/ { -/*?*/DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); +/*?*/DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); //STRIP001 /*?*/ return MovePage( fnPageCurr, fnPageStart ); /*N*/ } @@ -422,7 +422,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*N*/ FASTBOOL SwWrtShell::EndPg( FASTBOOL bSelect ) /*N*/ { -/*?*/DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); +/*?*/DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ShellMoveCrsr aTmp( this, bSelect ); //STRIP001 /*?*/ return MovePage( fnPageCurr, fnPageEnd ); /*N*/ } @@ -596,7 +596,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*?*/ aTmpArea.Pos().Y() -= pCrsrStack->lOffset; /*?*/ if( aTmpArea.IsInside( pCrsrStack->aDocPos ) ) /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if( bSelect ) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if( bSelect ) //STRIP001 /*?*/ SttSelect(); //STRIP001 /*?*/ else //STRIP001 /*?*/ EndSelect(); @@ -614,7 +614,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*?*/ // alle gemerkten Positionen weggeschmissen /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 _ResetCursorStack(); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 _ResetCursorStack(); /*?*/ return FALSE; /*?*/ } /*?*/ } @@ -692,7 +692,7 @@ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 if ( !bSelect && !bBasic /*N*/ BOOL SwWrtShell::GotoPage(USHORT nPage, BOOL bRecord) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 ShellMoveCrsr aTmp( this, FALSE); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ShellMoveCrsr aTmp( this, FALSE); //STRIP001 /*?*/ if( SwCrsrShell::GotoPage(nPage) && bRecord) //STRIP001 /*?*/ { //STRIP001 /*?*/ if(IsSelFrmMode()) diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx index 7180fdfbf..47088fb26 100644 --- a/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx +++ b/binfilter/bf_sw/source/ui/wrtsh/sw_select.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_select.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:58:55 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -366,7 +366,7 @@ BOOL SwWrtShell::SelSentence(const Point *pPt, BOOL ) * eine gfs. bestehende Selektion an der Position des * Mausklicks aufheben */ -/*?*/ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if(!IsInSelect() && ChgCurrPam(*pPt)) { +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if(!IsInSelect() && ChgCurrPam(*pPt)) { //STRIP001 ClearMark(); //STRIP001 } //STRIP001 return SwCrsrShell::SetCrsr(*pPt, bTextOnly); @@ -593,7 +593,7 @@ BOOL SwWrtShell::SelSentence(const Point *pPt, BOOL ) /*N*/ void SwWrtShell::EnterStdMode() /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if(bAddMode) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if(bAddMode) //STRIP001 /*?*/ LeaveAddMode(); //STRIP001 /*?*/ bExtMode = FALSE; //STRIP001 /*?*/ bInSelect = FALSE; @@ -649,7 +649,7 @@ BOOL SwWrtShell::SelSentence(const Point *pPt, BOOL ) /*N*/ long SwWrtShell::SttLeaveSelect(const Point *, BOOL ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 if(SwCrsrShell::HasSelection() && !IsSelTblCells() && bClearMark) { +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if(SwCrsrShell::HasSelection() && !IsSelTblCells() && bClearMark) { //STRIP001 return 0; //STRIP001 } //STRIP001 // if( IsSelTblCells() ) aSelTblLink.Call(this); @@ -733,7 +733,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if(SwCrsrShell::HasSelection() && !IsSel /*N*/ void SwWrtShell::EnterSelFrmMode(const Point *pPos) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if(pPos) +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if(pPos) //STRIP001 /*?*/ { //STRIP001 /*?*/ nStartDragX = pPos->X(); //STRIP001 /*?*/ nStartDragY = pPos->Y(); @@ -752,7 +752,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if(SwCrsrShell::HasSelection() && !IsSel /*N*/ void SwWrtShell::LeaveSelFrmMode() /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 fnDrag = &SwWrtShell::BeginDrag; +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 fnDrag = &SwWrtShell::BeginDrag; //STRIP001 /*?*/ fnEndDrag = &SwWrtShell::EndDrag; //STRIP001 /*?*/ bLayoutMode = FALSE; //STRIP001 /*?*/ bStartDrag = FALSE; @@ -767,7 +767,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 if(SwCrsrShell::HasSelection() && !IsSel /*N*/ IMPL_LINK( SwWrtShell, ExecFlyMac, void *, pFlyFmt ) /*N*/ { -DBG_ASSERT(0, "STRIP"); //STRIP001 const SwFrmFmt *pFmt = pFlyFmt ? (SwFrmFmt*)pFlyFmt : GetFlyFrmFmt(); +DBG_BF_ASSERT(0, "STRIP"); //STRIP001 const SwFrmFmt *pFmt = pFlyFmt ? (SwFrmFmt*)pFlyFmt : GetFlyFrmFmt(); //STRIP001 ASSERT(pFmt, kein FrameFormat.); //STRIP001 const SvxMacroItem &rFmtMac = pFmt->GetMacro(); //STRIP001 @@ -819,7 +819,7 @@ DBG_ASSERT(0, "STRIP"); //STRIP001 const SwFrmFmt *pFmt = pFlyFmt ? (SwFrmFmt*) /*N*/ long SwWrtShell::BeginDrag(const Point *pPt, BOOL ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if(bSelWrd) +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if(bSelWrd) //STRIP001 { //STRIP001 bInSelect = TRUE; //STRIP001 if( !IsCrsrPtAtEnd() ) @@ -857,7 +857,7 @@ DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 if(bSelWrd) /*N*/ long SwWrtShell::EndDrag(const Point *pPt, BOOL ) /*N*/ { -DBG_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 fnDrag = &SwWrtShell::BeginDrag; +DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 //STRIP001 fnDrag = &SwWrtShell::BeginDrag; //STRIP001 if( IsExtSel() ) //STRIP001 LeaveExtSel(); //STRIP001 diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx index b8baae450..589cf9b17 100644 --- a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx +++ b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_wrtsh1.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:58:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -885,7 +885,7 @@ namespace binfilter { /*N*/ void SwWrtShell::ConnectObj( SvInPlaceObjectRef xIPObj, const SwRect &rPrt, /*N*/ const SwRect &rFrm ) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SfxInPlaceClientRef xCli = GetView().FindIPClient( xIPObj, //STRIP001 &GetView().GetEditWin()); //STRIP001 if ( !xCli.Is() ) @@ -1220,7 +1220,7 @@ namespace binfilter { /*?*/ nCnt = SEL_DRW_TXT; /*?*/ else /*?*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); //STRIP001 if (GetView().IsFormMode()) // Nur Forms selektiert +/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (GetView().IsFormMode()) // Nur Forms selektiert //STRIP001 /*?*/ nCnt = SEL_DRW_FORM; //STRIP001 /*?*/ else //STRIP001 /*?*/ nCnt = SEL_DRW; // Irgendein Draw-Objekt @@ -1479,7 +1479,7 @@ namespace binfilter { /*N*/ { /*N*/ SET_CURR_SHELL( this ); /*N*/ while(IsModePushed()) -/*?*/ {DBG_ASSERT(0, "STRIP");} //STRIP001 PopMode(); +/*?*/ {DBG_BF_ASSERT(0, "STRIP");} //STRIP001 PopMode(); /*N*/ while(PopCrsr(FALSE)) /*N*/ ; /*N*/ SwTransferable::ClearSelection( *this ); @@ -1565,7 +1565,7 @@ namespace binfilter { // -------------- /*N*/ void SwWrtShell::ChgDBData(const SwDBData& aDBData) -/*N*/ {DBG_ASSERT(0, "STRIP"); //STRIP001 +/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 SwEditShell::ChgDBData(aDBData); //STRIP001 //notify the db-beamer if available //STRIP001 GetView().NotifyDBChanged(); diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx index 354e8be5b..3358af53e 100644 --- a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx +++ b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sw_wrtsh3.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mwu $ $Date: 2003-11-06 07:58:56 $ + * last change: $Author: rt $ $Date: 2004-05-05 16:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -183,7 +183,7 @@ extern sal_Bool bNoInterrupt; // in mainwn.cxx /*N*/ FASTBOOL SwWrtShell::GotoBookmark( sal_uInt16 nPos ) /*N*/ { -/*?*/ DBG_ASSERT(0, "STRIP"); return FALSE;//STRIP001 return MoveBookMark( BOOKMARK_INDEX, nPos ); +/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 return MoveBookMark( BOOKMARK_INDEX, nPos ); /*N*/ } |