diff options
Diffstat (limited to 'sw/source/core/undo')
29 files changed, 336 insertions, 343 deletions
diff --git a/sw/source/core/undo/SwRewriter.cxx b/sw/source/core/undo/SwRewriter.cxx index 129bdc8f9b59..07e51eb1c54c 100644 --- a/sw/source/core/undo/SwRewriter.cxx +++ b/sw/source/core/undo/SwRewriter.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx index 8a3c6c507c93..9d9c74b1e563 100644 --- a/sw/source/core/undo/SwUndoField.cxx +++ b/sw/source/core/undo/SwUndoField.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx index f3b2fe4d1a25..339f3374f2cf 100644 --- a/sw/source/core/undo/SwUndoFmt.cxx +++ b/sw/source/core/undo/SwUndoFmt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx index 9a395375eabe..b6eb8797eced 100644 --- a/sw/source/core/undo/SwUndoPageDesc.cxx +++ b/sw/source/core/undo/SwUndoPageDesc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/undo/SwUndoTOXChange.cxx b/sw/source/core/undo/SwUndoTOXChange.cxx index 8628ff70acc7..8c1d6dcd8c4a 100644 --- a/sw/source/core/undo/SwUndoTOXChange.cxx +++ b/sw/source/core/undo/SwUndoTOXChange.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ void SwUndoTOXChange::UpdateTOXBaseSection() if (pTOX->ISA(SwTOXBaseSection)) { SwTOXBaseSection * pTOXBase = static_cast<SwTOXBaseSection *>(pTOX); - + pTOXBase->Update(); pTOXBase->UpdatePageNum(); } diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 85adbd1c7138..f596898aae6d 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <doc.hxx> #include <pam.hxx> #include <ndtxt.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <undobj.hxx> #include <rolbck.hxx> #include <docary.hxx> @@ -46,7 +46,7 @@ using namespace ::com::sun::star; -USHORT SwDoc::nUndoActions = UNDO_ACTION_COUNT; // anzahl von Undo-Action +USHORT SwDoc::nUndoActions = UNDO_ACTION_COUNT; // anzahl von Undo-Action // the undo array should never grow beyond this limit: #define UNDO_ACTION_LIMIT (USHRT_MAX - 1000) @@ -162,10 +162,10 @@ void SwDoc::AppendUndo( SwUndo* pUndo ) ++nUndoPos; switch( pUndo->GetId() ) { - case UNDO_START: ++nUndoSttEnd; + case UNDO_START: ++nUndoSttEnd; break; - case UNDO_END: ASSERT( nUndoSttEnd, "Undo-Ende ohne Start" ); + case UNDO_END: ASSERT( nUndoSttEnd, "Undo-Ende ohne Start" ); --nUndoSttEnd; // kein break !!! default: @@ -192,9 +192,9 @@ void SwDoc::AppendUndo( SwUndo* pUndo ) return; // folgende Array-Grenzen muessen ueberwacht werden: - // - Undo, Grenze: fester Wert oder USHRT_MAX - 1000 - // - UndoNodes, Grenze: USHRT_MAX - 1000 - // - AttrHistory Grenze: USHRT_MAX - 1000 + // - Undo, Grenze: fester Wert oder USHRT_MAX - 1000 + // - UndoNodes, Grenze: USHRT_MAX - 1000 + // - AttrHistory Grenze: USHRT_MAX - 1000 // (defined in UNDO_ACTION_LIMIT at the top of this file) USHORT nEnde = UNDO_ACTION_LIMIT; @@ -238,7 +238,7 @@ void SwDoc::ClearRedo() { if( DoesUndo() && nUndoPos != pUndos->Count() ) { -//?? why ?? if( !nUndoSttEnd ) +//?? why ?? if( !nUndoSttEnd ) { // setze UndoCnt auf den neuen Wert SwUndo* pUndo; @@ -286,11 +286,11 @@ void SwDoc::DelAllUndoObj() // loescht alle UndoObjecte vom Anfang bis zum angegebenen Ende BOOL SwDoc::DelUndoObj( USHORT nEnde ) { - if( !nEnde ) // sollte mal 0 uebergeben werden, + if( !nEnde ) // sollte mal 0 uebergeben werden, { if( !pUndos->Count() ) return FALSE; - ++nEnde; // dann korrigiere es auf 1 + ++nEnde; // dann korrigiere es auf 1 } DoUndo( FALSE ); @@ -314,8 +314,8 @@ BOOL SwDoc::DelUndoObj( USHORT nEnde ) "Undo-Del-Ende liegt in einer Redo-Aktion" ); // dann setze ab Ende bis Undo-Ende bei allen Undo-Objecte die Werte um - nSttEndCnt = nCnt; // Position merken - if( nUndoSavePos < nSttEndCnt ) // SavePos wird aufgegeben + nSttEndCnt = nCnt; // Position merken + if( nUndoSavePos < nSttEndCnt ) // SavePos wird aufgegeben nUndoSavePos = USHRT_MAX; else if( nUndoSavePos != USHRT_MAX ) nUndoSavePos = nUndoSavePos - nSttEndCnt; @@ -388,7 +388,7 @@ bool SwDoc::Undo( SwUndoIter& rUndoIter ) // zum spaeteren ueberpruefen SwUndoId nAktId = pUndo->GetId(); //JP 11.05.98: FlyFormate ueber die EditShell selektieren, nicht aus dem - // Undo heraus + // Undo heraus switch( nAktId ) { case UNDO_START: @@ -417,10 +417,10 @@ bool SwDoc::Undo( SwUndoIter& rUndoIter ) --nUndoPos; // JP 29.10.96: Start und End setzen kein Modify-Flag. - // Sonst gibt es Probleme mit der autom. Aufnahme von Ausnahmen - // bei der Autokorrektur + // Sonst gibt es Probleme mit der autom. Aufnahme von Ausnahmen + // bei der Autokorrektur if( UNDO_START != nAktId && UNDO_END != nAktId ) - SetModified(); // default: immer setzen, kann zurueck gesetzt werden + SetModified(); // default: immer setzen, kann zurueck gesetzt werden // ist die History leer und wurde nicht wegen Speichermangel // verworfen, so kann das Dokument als unveraendert gelten @@ -490,7 +490,7 @@ SwUndoId SwDoc::EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter) while( nSize ) if( UNDO_START == ( nId = (pUndo = (*pUndos)[ --nSize ] )->GetId()) && !((SwUndoStart*)pUndo)->GetEndOffset() ) - break; // Start gefunden + break; // Start gefunden if( nId != UNDO_START ) { @@ -559,7 +559,7 @@ SwUndoId SwDoc::EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter) if( !nEndCnt ) // falls mal ein Start ohne Ende vorhanden ist continue; --nEndCnt; - if( !nEndCnt ) // hier ist der Anfang + if( !nEndCnt ) // hier ist der Anfang break; } else if( UNDO_END == nTmpId ) @@ -827,7 +827,7 @@ bool SwDoc::Redo( SwUndoIter& rUndoIter ) SetRedlineMode_intern( (RedlineMode_t)(eTmpMode | nsRedlineMode_t::REDLINE_IGNORE)); //JP 11.05.98: FlyFormate ueber die EditShell selektieren, nicht aus dem - // Undo heraus + // Undo heraus if( UNDO_START != pUndo->GetId() && UNDO_END != pUndo->GetId() ) rUndoIter.ClearSelections(); @@ -937,7 +937,7 @@ bool SwDoc::Repeat( SwUndoIter& rUndoIter, sal_uInt16 nRepeatCnt ) SwPaM* pTmpCrsr = rUndoIter.pAktPam; SwUndoId nId = UNDO_EMPTY; - if( pTmpCrsr != pTmpCrsr->GetNext() || !bOneUndo ) // Undo-Klammerung aufbauen + if( pTmpCrsr != pTmpCrsr->GetNext() || !bOneUndo ) // Undo-Klammerung aufbauen { if (pUndo->GetId() == UNDO_END) { @@ -949,12 +949,12 @@ bool SwDoc::Repeat( SwUndoIter& rUndoIter, sal_uInt16 nRepeatCnt ) StartUndo( nId, NULL ); } - do { // dann durchlaufe mal den gesamten Ring + do { // dann durchlaufe mal den gesamten Ring for( USHORT nRptCnt = nRepeatCnt; nRptCnt > 0; --nRptCnt ) { rUndoIter.pLastUndoObj = 0; for( USHORT nCnt = nSize; nCnt < nEndCnt; ++nCnt ) - (*pUndos)[ nCnt ]->Repeat( rUndoIter ); // Repeat ausfuehren + (*pUndos)[ nCnt ]->Repeat( rUndoIter ); // Repeat ausfuehren } } while( pTmpCrsr != ( rUndoIter.pAktPam = (SwPaM*)rUndoIter.pAktPam->GetNext() )); diff --git a/sw/source/core/undo/makefile.mk b/sw/source/core/undo/makefile.mk index d6e6766a0fd4..c381761adba1 100644 --- a/sw/source/core/undo/makefile.mk +++ b/sw/source/core/undo/makefile.mk @@ -49,6 +49,7 @@ EXCEPTIONSFILES = \ $(SLO)$/unattr.obj \ $(SLO)$/undobj.obj \ $(SLO)$/undraw.obj \ + $(SLO)$/unovwr.obj \ $(SLO)$/untbl.obj SLOFILES = \ diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 6df9f9aa24b8..9526112d0efb 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,16 +48,16 @@ #include <ftnidx.hxx> #include <doc.hxx> // SwDoc.GetNodes() #include <docary.hxx> -#include <ndtxt.hxx> // SwTxtNode -#include <paratr.hxx> // -#include <cellatr.hxx> // -#include <fldbas.hxx> // fuer Felder -#include <pam.hxx> // fuer SwPaM +#include <ndtxt.hxx> // SwTxtNode +#include <paratr.hxx> // +#include <cellatr.hxx> // +#include <fldbas.hxx> // fuer Felder +#include <pam.hxx> // fuer SwPaM #include <swtable.hxx> #include <rolbck.hxx> -#include <ndgrf.hxx> // SwGrfNode -#include <undobj.hxx> // fuer UndoDelete -#include <IMark.hxx> // fuer SwBookmark +#include <ndgrf.hxx> // SwGrfNode +#include <undobj.hxx> // fuer UndoDelete +#include <IMark.hxx> // fuer SwBookmark #include <charfmt.hxx> // #i27615# #ifndef _COMCORE_HRC #include <comcore.hrc> @@ -750,8 +750,8 @@ SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet, case RES_BOXATR_FORMULA: { //JP 20.04.98: Bug 49502 - wenn eine Formel gesetzt ist, nie den - // Value mit sichern. Der muss gegebenfalls neu - // errechnet werden! + // Value mit sichern. Der muss gegebenfalls neu + // errechnet werden! //JP 30.07.98: Bug 54295 - Formeln immer im Klartext speichern m_OldSet.ClearItem( RES_BOXATR_VALUE ); @@ -1042,7 +1042,7 @@ SwHistory::~SwHistory() |* |* void SwHistory::Add() |* -|* Beschreibung Dokument 1.0 +|* Beschreibung Dokument 1.0 |* Ersterstellung JP 18.02.91 |* Letzte Aenderung JP 18.02.91 |* @@ -1198,7 +1198,7 @@ void SwHistory::Add(const SfxItemSet & rSet, const SwCharFmt & rFmt) |* |* BOOL SwHistory::Rollback() |* -|* Beschreibung Dokument 1.0 +|* Beschreibung Dokument 1.0 |* Ersterstellung JP 18.02.91 |* Letzte Aenderung JP 18.02.91 |* @@ -1317,7 +1317,7 @@ void SwHistory::CopyAttr( SwpHints* pHts, ULONG nNodeIdx, pHt = pHts->GetTextHint(n); nAttrStt = *pHt->GetStart(); // JP: ???? wieso nAttrStt >= nEnd -// if( 0 != ( pEndIdx = pHt->GetEnd() ) && nAttrStt >= nEnd ) +// if( 0 != ( pEndIdx = pHt->GetEnd() ) && nAttrStt >= nEnd ) if( 0 != ( pEndIdx = pHt->GetEnd() ) && nAttrStt > nEnd ) break; @@ -1344,7 +1344,7 @@ void SwHistory::CopyAttr( SwpHints* pHts, ULONG nNodeIdx, { if ( nEnd > nAttrStt // JP: ???? wieso nAttrStt >= nEnd -// || (nEnd == nAttrStt && (!pEndIdx || nEnd == pEndIdx->GetIndex())) +// || (nEnd == nAttrStt && (!pEndIdx || nEnd == pEndIdx->GetIndex())) ) { Add( pHt, nNodeIdx, false ); diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index e3b54c59b142..429f9453a3d3 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ #include <ftnidx.hxx> #include <doc.hxx> #include <docary.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <swtable.hxx> @@ -377,8 +377,8 @@ void SwUndoFmtAttr::Repeat( SwUndoIter& rUndoIter) } break; -// case RES_CHRFMT: -// case RES_FRMFMT: +// case RES_CHRFMT: +// case RES_FRMFMT: case RES_FLYFRMFMT: { @@ -443,12 +443,12 @@ void SwUndoFmtAttr::SaveFlyAnchor( bool bSvDrwPt ) // store old value as attribute, to keep SwUndoFmtAttr small m_pOldSet->Put( SwFmtFrmSize( ATT_VAR_SIZE, aPt.X(), aPt.Y() ) ); } -/* else +/* else { pOldSet->Put( pFmt->GetVertOrient() ); pOldSet->Put( pFmt->GetHoriOrient() ); } -*/ } +*/ } const SwFmtAnchor& rAnchor = static_cast<const SwFmtAnchor&>( m_pOldSet->Get( RES_ANCHOR, FALSE ) ); @@ -534,7 +534,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor( SwUndoIter& rIter ) // den akt. wieder zwischenspeichern aDrawOldPt = pFrmFmt->FindSdrObject()->GetRelativePos(); //JP 08.10.97: ist laut AMA/MA nicht mehr noetig -// pCont->DisconnectFromLayout(); +// pCont->DisconnectFromLayout(); } else { @@ -594,7 +594,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor( SwUndoIter& rIter ) // Darum verhinder hier, das durch setzen des Ankers das // Contact-Object seine Position aendert. //JP 08.10.97: ist laut AMA/MA nicht mehr noetig -// pCont->ConnectToLayout(); +// pCont->ConnectToLayout(); SdrObject* pObj = pCont->GetMaster(); if( pCont->GetAnchorFrm() && !pObj->IsInserted() ) diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx index b86bdad692ac..3826f1816817 100644 --- a/sw/source/core/undo/unbkmk.cxx +++ b/sw/source/core/undo/unbkmk.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "doc.hxx" #include "docary.hxx" -#include "swundo.hxx" // fuer die UndoIds +#include "swundo.hxx" // fuer die UndoIds #include "pam.hxx" #include "undobj.hxx" @@ -86,7 +86,7 @@ SwRewriter SwUndoBookmark::GetRewriter() const return aResult; } -//---------------------------------------------------------------------- +//---------------------------------------------------------------------- SwUndoInsBookmark::SwUndoInsBookmark( const ::sw::mark::IMark& rBkmk ) diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index ef39a4e18950..edf6f99775dc 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include <fmtanchr.hxx> #include <doc.hxx> #include <swtable.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <undobj.hxx> @@ -183,7 +183,7 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara, BOOL bCalledByTblCpy ) pHistory->Add( pSttTxtNd->GetTxtColl(),pStt->nNode.GetIndex(), ND_TEXTNODE ); pHistory->Add( pEndTxtNd->GetTxtColl(),pEnd->nNode.GetIndex(), ND_TEXTNODE ); - if( !bJoinNext ) // Selection von Unten nach Oben + if( !bJoinNext ) // Selection von Unten nach Oben { // Beim JoinPrev() werden die AUTO-PageBreak's richtig // kopiert. Um diese beim Undo wieder herzustellen, muss das @@ -211,14 +211,14 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara, BOOL bCalledByTblCpy ) if( !pSttTxtNd && !pEndTxtNd ) rPam.GetPoint()->nNode--; - rPam.DeleteMark(); // der SPoint ist aus dem Bereich + rPam.DeleteMark(); // der SPoint ist aus dem Bereich if( !pEndTxtNd ) nEndCntnt = 0; if( !pSttTxtNd ) nSttCntnt = 0; - if( bMoveNds ) // sind noch Nodes zu verschieben ? + if( bMoveNds ) // sind noch Nodes zu verschieben ? { SwNodes& rNds = (SwNodes&)*pDoc->GetUndoNds(); SwNodes& rDocNds = pDoc->GetNodes(); @@ -306,7 +306,7 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara, BOOL bCalledByTblCpy ) nNode = rNds.GetEndOfContent().GetIndex(); rDocNds._MoveNodes( aRg, rNds, SwNodeIndex( rNds.GetEndOfContent() )); pMvStt = new SwNodeIndex( rNds, nNode ); - nNode = rNds.GetEndOfContent().GetIndex() - nNode; // Differenz merken ! + nNode = rNds.GetEndOfContent().GetIndex() - nNode; // Differenz merken ! if( pSttTxtNd && pEndTxtNd ) { //Step 4: Moving around sections @@ -333,7 +333,7 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, BOOL bFullPara, BOOL bCalledByTblCpy ) bJoinNext ? pEndTxtNd->GetIndex() : pSttTxtNd->GetIndex() ); } else - nNode = 0; // kein Node verschoben -> keine Differenz zum Ende + nNode = 0; // kein Node verschoben -> keine Differenz zum Ende // wurden davor noch Nodes geloescht ?? (FootNotes haben ContentNodes!) if( !pSttTxtNd && !pEndTxtNd ) @@ -525,7 +525,7 @@ SwUndoDelete::~SwUndoDelete() { delete pSttStr; delete pEndStr; - if( pMvStt ) // loesche noch den Bereich aus dem UndoNodes Array + if( pMvStt ) // loesche noch den Bereich aus dem UndoNodes Array { // Insert speichert den Inhalt in der IconSection pMvStt->GetNode().GetNodes().Delete( *pMvStt, nNode ); @@ -662,7 +662,7 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter ) SwNodeIndex aIdx( pDoc->GetNodes(), nCalcStt ); SwNode* pInsNd = &aIdx.GetNode(); - { // Block, damit der SwPosition beim loeschen vom Node + { // Block, damit der SwPosition beim loeschen vom Node // abgemeldet ist SwPosition aPos( aIdx ); if( !bDelFullPara ) @@ -680,11 +680,11 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter ) if( pInsNd->IsCntntNode() ) aPos.nContent.Assign( (SwCntntNode*)pInsNd, nSttCntnt ); if( !bTblDelLastNd ) - pInsNd = 0; // Node nicht loeschen !! + pInsNd = 0; // Node nicht loeschen !! } } else - pInsNd = 0; // Node nicht loeschen !! + pInsNd = 0; // Node nicht loeschen !! SwNodes* pUNds = (SwNodes*)pDoc->GetUndoNds(); BOOL bNodeMove = 0 != nNode; @@ -805,7 +805,7 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter ) pTxtNd->ClearSwpHintsArr( true ); // SectionNode-Modus und von oben nach unten selektiert: - // -> im StartNode steht noch der Rest vom Join => loeschen + // -> im StartNode steht noch der Rest vom Join => loeschen aPos.nContent.Assign( pTxtNd, nSttCntnt ); pTxtNd->InsertText( *pSttStr, aPos.nContent, IDocumentContentOperations::INS_NOHINTEXPAND ); @@ -817,7 +817,7 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter ) if( pHistory ) { pHistory->TmpRollback( pDoc, nSetPos, false ); - if( nSetPos ) // es gab Fussnoten/FlyFrames + if( nSetPos ) // es gab Fussnoten/FlyFrames { // gibts ausser diesen noch andere ? if( nSetPos < pHistory->Count() ) @@ -854,7 +854,7 @@ void SwUndoDelete::Undo( SwUndoIter& rUndoIter ) if( pRedlSaveData ) SetSaveData( *pDoc, *pRedlSaveData ); - pDoc->DoUndo( bUndo ); // Undo wieder einschalten + pDoc->DoUndo( bUndo ); // Undo wieder einschalten SetPaM( rUndoIter, TRUE ); } diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index 8edccd344adf..707ff307be48 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,31 +52,31 @@ #define STR_INSERTSECTION (UNDO_BASE +19) #define STR_OUTLINE_LR (UNDO_BASE +20) #define STR_OUTLINE_UD (UNDO_BASE +21) -#define STR_INSNUM (UNDO_BASE +22) -#define STR_NUMUP (UNDO_BASE +23) -#define STR_MOVENUM (UNDO_BASE +24) -#define STR_INSERTDRAW (UNDO_BASE +25) -#define STR_NUMORNONUM (UNDO_BASE +26) -#define STR_INC_LEFTMARGIN (UNDO_BASE +27) -#define STR_DEC_LEFTMARGIN (UNDO_BASE +28) -#define STR_INSERTLABEL (UNDO_BASE +29) -#define STR_SETNUMRULESTART (UNDO_BASE +30) -#define STR_CHANGEFTN (UNDO_BASE +31) -#define STR_REDLINE (UNDO_BASE +32) -#define STR_ACCEPT_REDLINE (UNDO_BASE +33) -#define STR_REJECT_REDLINE (UNDO_BASE +34) -#define STR_SPLIT_TABLE (UNDO_BASE +35) -#define STR_DONTEXPAND (UNDO_BASE +36) -#define STR_AUTOCORRECT (UNDO_BASE +37) -#define STR_MERGE_TABLE (UNDO_BASE +38) -#define STR_TRANSLITERATE (UNDO_BASE +39) +#define STR_INSNUM (UNDO_BASE +22) +#define STR_NUMUP (UNDO_BASE +23) +#define STR_MOVENUM (UNDO_BASE +24) +#define STR_INSERTDRAW (UNDO_BASE +25) +#define STR_NUMORNONUM (UNDO_BASE +26) +#define STR_INC_LEFTMARGIN (UNDO_BASE +27) +#define STR_DEC_LEFTMARGIN (UNDO_BASE +28) +#define STR_INSERTLABEL (UNDO_BASE +29) +#define STR_SETNUMRULESTART (UNDO_BASE +30) +#define STR_CHANGEFTN (UNDO_BASE +31) +#define STR_REDLINE (UNDO_BASE +32) +#define STR_ACCEPT_REDLINE (UNDO_BASE +33) +#define STR_REJECT_REDLINE (UNDO_BASE +34) +#define STR_SPLIT_TABLE (UNDO_BASE +35) +#define STR_DONTEXPAND (UNDO_BASE +36) +#define STR_AUTOCORRECT (UNDO_BASE +37) +#define STR_MERGE_TABLE (UNDO_BASE +38) +#define STR_TRANSLITERATE (UNDO_BASE +39) #define STR_PASTE_CLIPBOARD_UNDO (UNDO_BASE +40) -#define STR_TYPING_UNDO (UNDO_BASE +41) +#define STR_TYPING_UNDO (UNDO_BASE +41) -#define STR_REPEAT_DUMMY_6 (UNDO_BASE +42) -#define STR_REPEAT_DUMMY_7 (UNDO_BASE +43) -#define STR_REPEAT_DUMMY_8 (UNDO_BASE +44) -#define STR_REPEAT_DUMMY_9 (UNDO_BASE +45) +#define STR_REPEAT_DUMMY_6 (UNDO_BASE +42) +#define STR_REPEAT_DUMMY_7 (UNDO_BASE +43) +#define STR_REPEAT_DUMMY_8 (UNDO_BASE +44) +#define STR_REPEAT_DUMMY_9 (UNDO_BASE +45) // !!!!!! umsetzen !!!!!!!!!!! umsetzen !!!!!!!!!!! umsetzen !!!! #define CORE_REPEAT_END STR_REPEAT_DUMMY_9// !!!! umsetzen !!! @@ -99,10 +99,10 @@ #define STR_DRAWGROUP (CORE_REPEAT_END +15) #define STR_DRAWUNGROUP (CORE_REPEAT_END +16) #define STR_DRAWDELETE (CORE_REPEAT_END +17) -#define STR_REREAD (CORE_REPEAT_END +18) -#define STR_DELGRF (CORE_REPEAT_END +19) -#define STR_DELOLE (CORE_REPEAT_END +20) -#define STR_TABLE_ATTR (CORE_REPEAT_END +21) +#define STR_REREAD (CORE_REPEAT_END +18) +#define STR_DELGRF (CORE_REPEAT_END +19) +#define STR_DELOLE (CORE_REPEAT_END +20) +#define STR_TABLE_ATTR (CORE_REPEAT_END +21) #define STR_TABLE_AUTOFMT (CORE_REPEAT_END +22) #define STR_TABLE_INSCOL (CORE_REPEAT_END +23) #define STR_TABLE_INSROW (CORE_REPEAT_END +24) @@ -110,40 +110,40 @@ #define STR_TABLE_SPLIT (CORE_REPEAT_END +26) #define STR_TABLE_MERGE (CORE_REPEAT_END +27) #define STR_TABLE_NUMFORMAT (CORE_REPEAT_END +28) -#define STR_INSERT_TOX (CORE_REPEAT_END +29) -#define STR_CLEAR_TOX_RANGE (CORE_REPEAT_END +30) -#define STR_TABLE_TBLCPYTBL (CORE_REPEAT_END +31) -#define STR_TABLE_CPYTBL (CORE_REPEAT_END +32) -#define STR_INS_FROM_SHADOWCRSR (CORE_REPEAT_END +33) -#define STR_UNDO_CHAIN (CORE_REPEAT_END +34) -#define STR_UNDO_UNCHAIN (CORE_REPEAT_END +35) -#define STR_UNDO_FTNINFO (CORE_REPEAT_END +36) -#define STR_UNDO_ENDNOTEINFO (CORE_REPEAT_END +37) -#define STR_UNDO_COMPAREDOC (CORE_REPEAT_END +38) -#define STR_UNDO_SETFLYFRMFMT (CORE_REPEAT_END +39) -#define STR_UNDO_SETRUBYATTR (CORE_REPEAT_END +40) +#define STR_INSERT_TOX (CORE_REPEAT_END +29) +#define STR_CLEAR_TOX_RANGE (CORE_REPEAT_END +30) +#define STR_TABLE_TBLCPYTBL (CORE_REPEAT_END +31) +#define STR_TABLE_CPYTBL (CORE_REPEAT_END +32) +#define STR_INS_FROM_SHADOWCRSR (CORE_REPEAT_END +33) +#define STR_UNDO_CHAIN (CORE_REPEAT_END +34) +#define STR_UNDO_UNCHAIN (CORE_REPEAT_END +35) +#define STR_UNDO_FTNINFO (CORE_REPEAT_END +36) +#define STR_UNDO_ENDNOTEINFO (CORE_REPEAT_END +37) +#define STR_UNDO_COMPAREDOC (CORE_REPEAT_END +38) +#define STR_UNDO_SETFLYFRMFMT (CORE_REPEAT_END +39) +#define STR_UNDO_SETRUBYATTR (CORE_REPEAT_END +40) // #102505# -#define STR_UNDO_TMPAUTOCORR (CORE_REPEAT_END +41) +#define STR_UNDO_TMPAUTOCORR (CORE_REPEAT_END +41) -#define STR_TOXCHANGE (CORE_REPEAT_END +42) +#define STR_TOXCHANGE (CORE_REPEAT_END +42) #define STR_UNDO_PAGEDESC_CREATE (CORE_REPEAT_END +43) -#define STR_UNDO_PAGEDESC (CORE_REPEAT_END +44) -#define STR_UNDO_PAGEDESC_DELETE (CORE_REPEAT_END +45) -#define STR_UNDO_HEADER_FOOTER (CORE_REPEAT_END +46) // #i7983# -#define STR_UNDO_FIELD (CORE_REPEAT_END +47) // #111840# -#define STR_UNDO_TXTFMTCOL_CREATE (CORE_REPEAT_END +48) -#define STR_UNDO_TXTFMTCOL_DELETE (CORE_REPEAT_END +49) -#define STR_UNDO_TXTFMTCOL_RENAME (CORE_REPEAT_END +50) -#define STR_UNDO_CHARFMT_CREATE (CORE_REPEAT_END +51) -#define STR_UNDO_CHARFMT_DELETE (CORE_REPEAT_END +52) -#define STR_UNDO_CHARFMT_RENAME (CORE_REPEAT_END +53) -#define STR_UNDO_FRMFMT_CREATE (CORE_REPEAT_END +54) -#define STR_UNDO_FRMFMT_DELETE (CORE_REPEAT_END +55) -#define STR_UNDO_FRMFMT_RENAME (CORE_REPEAT_END +56) -#define STR_UNDO_NUMRULE_CREATE (CORE_REPEAT_END +57) -#define STR_UNDO_NUMRULE_DELETE (CORE_REPEAT_END +58) -#define STR_UNDO_NUMRULE_RENAME (CORE_REPEAT_END +59) -#define STR_UNDO_BOOKMARK_RENAME (CORE_REPEAT_END +60) +#define STR_UNDO_PAGEDESC (CORE_REPEAT_END +44) +#define STR_UNDO_PAGEDESC_DELETE (CORE_REPEAT_END +45) +#define STR_UNDO_HEADER_FOOTER (CORE_REPEAT_END +46) // #i7983# +#define STR_UNDO_FIELD (CORE_REPEAT_END +47) // #111840# +#define STR_UNDO_TXTFMTCOL_CREATE (CORE_REPEAT_END +48) +#define STR_UNDO_TXTFMTCOL_DELETE (CORE_REPEAT_END +49) +#define STR_UNDO_TXTFMTCOL_RENAME (CORE_REPEAT_END +50) +#define STR_UNDO_CHARFMT_CREATE (CORE_REPEAT_END +51) +#define STR_UNDO_CHARFMT_DELETE (CORE_REPEAT_END +52) +#define STR_UNDO_CHARFMT_RENAME (CORE_REPEAT_END +53) +#define STR_UNDO_FRMFMT_CREATE (CORE_REPEAT_END +54) +#define STR_UNDO_FRMFMT_DELETE (CORE_REPEAT_END +55) +#define STR_UNDO_FRMFMT_RENAME (CORE_REPEAT_END +56) +#define STR_UNDO_NUMRULE_CREATE (CORE_REPEAT_END +57) +#define STR_UNDO_NUMRULE_DELETE (CORE_REPEAT_END +58) +#define STR_UNDO_NUMRULE_RENAME (CORE_REPEAT_END +59) +#define STR_UNDO_BOOKMARK_RENAME (CORE_REPEAT_END +60) #define STR_UNDO_INDEX_ENTRY_INSERT (CORE_REPEAT_END +61) #define STR_UNDO_INDEX_ENTRY_DELETE (CORE_REPEAT_END +62) #define STR_UNDO_COL_DELETE (CORE_REPEAT_END +63) @@ -166,12 +166,12 @@ #define STR_DRAG_AND_COPY (UI_UNDO_BEGIN + 5) #define STR_DRAG_AND_MOVE (UI_UNDO_BEGIN + 6) #define STR_INSERT_RULER (UI_UNDO_BEGIN + 7) -#define STR_INSERT_CHART (UI_UNDO_BEGIN + 8) -#define STR_INSERT_FOOTNOTE (UI_UNDO_BEGIN + 9) -#define STR_INSERT_URLBTN (UI_UNDO_BEGIN + 10) -#define STR_INSERT_URLTXT (UI_UNDO_BEGIN + 11) -#define STR_DELETE_INVISIBLECNTNT (UI_UNDO_BEGIN + 12) -#define STR_REPLACE_STYLE (UI_UNDO_BEGIN + 13) +#define STR_INSERT_CHART (UI_UNDO_BEGIN + 8) +#define STR_INSERT_FOOTNOTE (UI_UNDO_BEGIN + 9) +#define STR_INSERT_URLBTN (UI_UNDO_BEGIN + 10) +#define STR_INSERT_URLTXT (UI_UNDO_BEGIN + 11) +#define STR_DELETE_INVISIBLECNTNT (UI_UNDO_BEGIN + 12) +#define STR_REPLACE_STYLE (UI_UNDO_BEGIN + 13) #define UI_UNDO_END STR_REPLACE_STYLE #define UNDO_MORE_STRINGS_BEGIN (UI_UNDO_END + 1) diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src index 1035d8cb0d0f..4ad1e70b7869 100644 --- a/sw/source/core/undo/undo.src +++ b/sw/source/core/undo/undo.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 1a71a705b2fb..02156626abdb 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include <frmfmt.hxx> #include <doc.hxx> #include <docary.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <undobj.hxx> @@ -131,12 +131,12 @@ void SwUndRng::SetPaM( SwPaM & rPam, BOOL bCorrToCntnt ) const else rPam.GetPoint()->nContent.Assign( 0, 0 ); - if( !nEndNode && STRING_MAXLEN == nEndCntnt ) // keine Selection + if( !nEndNode && STRING_MAXLEN == nEndCntnt ) // keine Selection return ; rPam.SetMark(); if( nSttNode == nEndNode && nSttCntnt == nEndCntnt ) - return; // nichts mehr zu tun + return; // nichts mehr zu tun rPam.GetPoint()->nNode = nEndNode; if( (pNd = rPam.GetNode())->IsCntntNode() ) @@ -279,11 +279,11 @@ SwUndoSaveCntnt::~SwUndoSaveCntnt() // Inhalte in das UndoNodesArray verschoben. Diese Methoden fuegen // am Ende eines TextNodes fuer die Attribute einen Trenner ein. // Dadurch werden die Attribute nicht expandiert. - // MoveTo.. verschiebt aus dem NodesArray in das UndoNodesArray - // MoveFrom.. verschiebt aus dem UndoNodesArray in das NodesArray + // MoveTo.. verschiebt aus dem NodesArray in das UndoNodesArray + // MoveFrom.. verschiebt aus dem UndoNodesArray in das NodesArray - // 2.8.93: ist pEndNdIdx angebenen, wird vom Undo/Redo -Ins/DelFly - // aufgerufen. Dann soll die gesamte Section verschoben werden. + // 2.8.93: ist pEndNdIdx angebenen, wird vom Undo/Redo -Ins/DelFly + // aufgerufen. Dann soll die gesamte Section verschoben werden. void SwUndoSaveCntnt::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx, SwIndex* pCntIdx, ULONG* pEndNdIdx, xub_StrLen* pEndCntIdx ) @@ -330,7 +330,7 @@ void SwUndoSaveCntnt::MoveToUndoNds( SwPaM& rPaM, SwNodeIndex* pNodeIdx, rDoc.GetNodes().MoveRange( rPaM, aPos, rNds ); SwTxtNode* pTxtNd = aPos.nNode.GetNode().GetTxtNode(); - if( pTxtNd ) // fuege einen Trenner fuer die Attribute ein ! + if( pTxtNd ) // fuege einen Trenner fuer die Attribute ein ! { // weil aber beim Insert die Attribute angefasst/sprich // aus dem Array geloescht und wieder eingefuegt werden, koennen @@ -382,13 +382,13 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, ULONG nNodeIdx, // jetzt kommt das wiederherstellen SwNodes& rNds = (SwNodes&)*rDoc.GetUndoNds(); if( nNodeIdx == rNds.GetEndOfPostIts().GetIndex() ) - return; // nichts gespeichert + return; // nichts gespeichert BOOL bUndo = rDoc.DoesUndo(); rDoc.DoUndo( FALSE ); SwPaM aPaM( rInsPos ); - if( pEndNdIdx ) // dann hole aus diesem den Bereich + if( pEndNdIdx ) // dann hole aus diesem den Bereich aPaM.GetPoint()->nNode.Assign( rNds, *pEndNdIdx ); else { @@ -397,7 +397,7 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, ULONG nNodeIdx, } SwTxtNode* pTxtNd = aPaM.GetNode()->GetTxtNode(); - if( !pEndNdIdx && pTxtNd ) // loesche den Trenner wieder + if( !pEndNdIdx && pTxtNd ) // loesche den Trenner wieder { if( pEndCntIdx ) aPaM.GetPoint()->nContent.Assign( pTxtNd, *pEndCntIdx ); @@ -417,7 +417,7 @@ void SwUndoSaveCntnt::MoveFromUndoNds( SwDoc& rDoc, ULONG nNodeIdx, // noch den letzen Node loeschen. if( !aPaM.GetPoint()->nContent.GetIndex() || - ( aPaM.GetPoint()->nNode++ && // noch leere Nodes am Ende ?? + ( aPaM.GetPoint()->nNode++ && // noch leere Nodes am Ende ?? &rNds.GetEndOfExtras() != &aPaM.GetPoint()->nNode.GetNode() )) { aPaM.GetPoint()->nContent.Assign( 0, 0 ); @@ -528,7 +528,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark, ( &pEnd->nNode.GetNode() == pFtnNd && nFtnSttIdx >= pEnd->nContent.GetIndex() )) ) { - ++nPos; // weiter suchen + ++nPos; // weiter suchen continue; } @@ -554,7 +554,7 @@ void SwUndoSaveCntnt::DelCntntIndex( const SwPosition& rMark, pStt->nContent.GetIndex() > nFtnSttIdx ) || ( &pEnd->nNode.GetNode() == pFtnNd && nFtnSttIdx >= pEnd->nContent.GetIndex() ))) - continue; // weiter suchen + continue; // weiter suchen // es muss leider ein Index angelegt werden. Sonst knallts im // TextNode, weil im DTOR der SwFtn dieser geloescht wird !! @@ -827,7 +827,7 @@ SwUndoSaveSection::SwUndoSaveSection() SwUndoSaveSection::~SwUndoSaveSection() { - if( pMvStt ) // loesche noch den Bereich aus dem UndoNodes Array + if( pMvStt ) // loesche noch den Bereich aus dem UndoNodes Array { // SaveSection speichert den Inhalt in der PostIt-Section SwNodes& rUNds = pMvStt->GetNode().GetNodes(); @@ -878,7 +878,7 @@ void SwUndoSaveSection::SaveSection( SwDoc* , const SwNodeRange& rRange ) void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx, USHORT nSectType ) { - if( ULONG_MAX != nStartPos ) // gab es ueberhaupt Inhalt ? + if( ULONG_MAX != nStartPos ) // gab es ueberhaupt Inhalt ? { // ueberpruefe, ob der Inhalt an der alten Position steht SwNodeIndex aSttIdx( pDoc->GetNodes(), nStartPos ); @@ -898,7 +898,7 @@ void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx, void SwUndoSaveSection::RestoreSection( SwDoc* pDoc, const SwNodeIndex& rInsPos ) { - if( ULONG_MAX != nStartPos ) // gab es ueberhaupt Inhalt ? + if( ULONG_MAX != nStartPos ) // gab es ueberhaupt Inhalt ? { SwPosition aInsPos( rInsPos ); ULONG nEnd = pMvStt->GetIndex() + nMvLen - 1; @@ -1054,23 +1054,23 @@ SwRedlineSaveData::SwRedlineSaveData( SwComparePosition eCmpPos, switch( eCmpPos ) { - case POS_OVERLAP_BEFORE: // Pos1 ueberlappt Pos2 am Anfang + case POS_OVERLAP_BEFORE: // Pos1 ueberlappt Pos2 am Anfang nEndNode = rEndPos.nNode.GetIndex(); nEndCntnt = rEndPos.nContent.GetIndex(); break; - case POS_OVERLAP_BEHIND: // Pos1 ueberlappt Pos2 am Ende + case POS_OVERLAP_BEHIND: // Pos1 ueberlappt Pos2 am Ende nSttNode = rSttPos.nNode.GetIndex(); nSttCntnt = rSttPos.nContent.GetIndex(); break; - case POS_INSIDE: // Pos1 liegt vollstaendig in Pos2 + case POS_INSIDE: // Pos1 liegt vollstaendig in Pos2 nSttNode = rSttPos.nNode.GetIndex(); nSttCntnt = rSttPos.nContent.GetIndex(); nEndNode = rEndPos.nNode.GetIndex(); nEndCntnt = rEndPos.nContent.GetIndex(); break; - case POS_OUTSIDE: // Pos2 liegt vollstaendig in Pos1 + case POS_OUTSIDE: // Pos2 liegt vollstaendig in Pos1 if( rRedl.GetContentIdx() ) { // dann den Bereich ins UndoArray verschieben und merken @@ -1079,7 +1079,7 @@ SwRedlineSaveData::SwRedlineSaveData( SwComparePosition eCmpPos, } break; - case POS_EQUAL: // Pos1 ist genauso gross wie Pos2 + case POS_EQUAL: // Pos1 ist genauso gross wie Pos2 break; default: diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index a0ba635549ac..07446350c2e6 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,11 +38,11 @@ #include <frmfmt.hxx> #include <flyfrm.hxx> #include <undobj.hxx> -#include <rolbck.hxx> // fuer die Attribut History +#include <rolbck.hxx> // fuer die Attribut History #include <doc.hxx> #include <docary.hxx> #include <rootfrm.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> // OD 26.06.2003 #108784# @@ -61,7 +61,7 @@ SwUndoFlyBase::SwUndoFlyBase( SwFrmFmt* pFormat, SwUndoId nUndoId ) SwUndoFlyBase::~SwUndoFlyBase() { - if( bDelFmt ) // loeschen waehrend eines Undo's ?? + if( bDelFmt ) // loeschen waehrend eines Undo's ?? delete pFrmFmt; } @@ -117,9 +117,9 @@ void SwUndoFlyBase::InsFly( SwUndoIter& rUndoIter, BOOL bShowSelFrm ) } //JP 18.12.98: Bug 60505 - InCntntAttribut erst setzen, wenn der Inhalt - // vorhanden ist! Sonst wuerde das Layout den Fly vorher - // formatieren, aber keine Inhalt finden; so geschene bei - // Grafiken aus dem Internet + // vorhanden ist! Sonst wuerde das Layout den Fly vorher + // formatieren, aber keine Inhalt finden; so geschene bei + // Grafiken aus dem Internet if (FLY_AS_CHAR == nRndId) { // es muss mindestens das Attribut im TextNode stehen @@ -162,8 +162,8 @@ void SwUndoFlyBase::InsFly( SwUndoIter& rUndoIter, BOOL bShowSelFrm ) void SwUndoFlyBase::DelFly( SwDoc* pDoc ) { - bDelFmt = TRUE; // im DTOR das Format loeschen - pFrmFmt->DelFrms(); // Frms vernichten. + bDelFmt = TRUE; // im DTOR das Format loeschen + pFrmFmt->DelFrms(); // Frms vernichten. // alle Uno-Objecte sollten sich jetzt abmelden { @@ -273,7 +273,7 @@ SwUndoInsLayFmt::~SwUndoInsLayFmt() void SwUndoInsLayFmt::Undo( SwUndoIter& rUndoIter ) { const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt(); - if( rCntnt.GetCntntIdx() ) // kein Inhalt + if( rCntnt.GetCntntIdx() ) // kein Inhalt { bool bRemoveIdx = true; if( mnCrsrSaveIndexPara > 0 ) @@ -440,7 +440,7 @@ void SwUndoDelLayFmt::Undo( SwUndoIter& rUndoIter ) void SwUndoDelLayFmt::Redo( SwUndoIter& rUndoIter ) { const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt(); - if( rCntnt.GetCntntIdx() ) // kein Inhalt + if( rCntnt.GetCntntIdx() ) // kein Inhalt RemoveIdxFromSection( rUndoIter.GetDoc(), rCntnt.GetCntntIdx()->GetIndex() ); @@ -450,7 +450,7 @@ void SwUndoDelLayFmt::Redo( SwUndoIter& rUndoIter ) void SwUndoDelLayFmt::Redo() { const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt(); - if( rCntnt.GetCntntIdx() ) // kein Inhalt + if( rCntnt.GetCntntIdx() ) // kein Inhalt RemoveIdxFromSection( *pFrmFmt->GetDoc(), rCntnt.GetCntntIdx()->GetIndex() ); @@ -466,7 +466,7 @@ SwUndoSetFlyFmt::SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt ) rFlyFmt.GetAttrSet().GetRanges() )), nOldNode( 0 ), nNewNode( 0 ), nOldCntnt( 0 ), nNewCntnt( 0 ), - nOldAnchorTyp( 0 ), nNewAnchorTyp( 0 ), bAnchorChgd( FALSE ) + nOldAnchorTyp( 0 ), nNewAnchorTyp( 0 ), bAnchorChgd( FALSE ) { } diff --git a/sw/source/core/undo/undoflystrattr.cxx b/sw/source/core/undo/undoflystrattr.cxx index 23113d6b0d1b..b5795a1db86e 100644 --- a/sw/source/core/undo/undoflystrattr.cxx +++ b/sw/source/core/undo/undoflystrattr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index 980496cfd518..b61462014c4d 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include <doc.hxx> #include <docary.hxx> #include <frame.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <undobj.hxx> @@ -217,7 +217,7 @@ SwUndoDrawGroup::~SwUndoDrawGroup() delete pTmp->pFmt; } else - delete pObjArr->pFmt; // das GroupObject-Format + delete pObjArr->pFmt; // das GroupObject-Format delete [] pObjArr; } @@ -229,7 +229,7 @@ void SwUndoDrawGroup::Undo( SwUndoIter& ) // das Group-Object sichern SwDrawFrmFmt* pFmt = pObjArr->pFmt; SwDrawContact* pDrawContact = (SwDrawContact*)pFmt->FindContactObj(); - SdrObject* pObj = pDrawContact->GetMaster(); + SdrObject* pObj = pDrawContact->GetMaster(); pObjArr->pObj = pObj; //loescht sich selbst! @@ -382,7 +382,7 @@ SwUndoDrawUnGroup::~SwUndoDrawUnGroup() delete pTmp->pFmt; } else - delete pObjArr->pFmt; // das GroupObject-Format + delete pObjArr->pFmt; // das GroupObject-Format delete [] pObjArr; } diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx index e67ec2e9d8c2..8157147e1b7a 100644 --- a/sw/source/core/undo/unfmco.cxx +++ b/sw/source/core/undo/unfmco.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "doc.hxx" -#include "swundo.hxx" // fuer die UndoIds +#include "swundo.hxx" // fuer die UndoIds #include "pam.hxx" #include "ndtxt.hxx" @@ -87,7 +87,7 @@ void SwUndoFmtColl::Redo( SwUndoIter& rUndoIter ) SetPaM( rUndoIter ); rUndoIter.pLastUndoObj = 0; - Repeat( rUndoIter ); // Collection setzen + Repeat( rUndoIter ); // Collection setzen rUndoIter.pLastUndoObj = 0; } diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index dd95d06a34b1..164cf20ea915 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include <fmtanchr.hxx> #include <frmfmt.hxx> #include <doc.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <undobj.hxx> @@ -93,9 +93,9 @@ inline SwDoc& SwUndoIter::GetDoc() const { return *pAktPam->GetDoc(); } // zwei Zugriffs-Funktionen inline SwPosition* IterPt( SwUndoIter& rUIter ) -{ return rUIter.pAktPam->GetPoint(); } +{ return rUIter.pAktPam->GetPoint(); } inline SwPosition* IterMk( SwUndoIter& rUIter ) -{ return rUIter.pAktPam->GetMark(); } +{ return rUIter.pAktPam->GetMark(); } //------------------------------------------------------------ @@ -241,7 +241,7 @@ SwUndoInsert::~SwUndoInsert() pPos->nNode.GetIndex() ); delete pPos; } - else if( pTxt ) // der eingefuegte Text + else if( pTxt ) // der eingefuegte Text delete pTxt; delete pRedlData; } @@ -291,7 +291,7 @@ void SwUndoInsert::Undo( SwUndoIter& rUndoIter ) pTxt = new String( pTxtNode->GetTxt().Copy(nCntnt-nLen, nLen) ); pTxtNode->EraseText( aPaM.GetPoint()->nContent, nLen ); } - else // ansonsten Grafik/OLE/Text/... + else // ansonsten Grafik/OLE/Text/... { aPaM.Move(fnMoveBackward); if( IDocumentRedlineAccess::IsRedlineOn( GetRedlineMode() )) @@ -412,7 +412,7 @@ void SwUndoInsert::Repeat( SwUndoIter& rUndoIter ) SwNodeIndex aNd( rDoc.GetNodes(), nNode ); SwCntntNode* pCNd = aNd.GetNode().GetCntntNode();; - if( !bIsAppend && 1 == nLen ) // >1 dann immer nur Text, ansonsten Grafik/OLE/Text/... + if( !bIsAppend && 1 == nLen ) // >1 dann immer nur Text, ansonsten Grafik/OLE/Text/... { SwPaM aPaM( *pCNd, nCntnt ); aPaM.SetMark(); @@ -529,7 +529,7 @@ void SwUndoReplace::Undo( SwUndoIter& rUndoIter ) aArr[ --nAktPos ]->Undo( rUndoIter ); - if( !nAktPos ) // alten Status wieder zurueck + if( !nAktPos ) // alten Status wieder zurueck rUndoIter.bWeiter = bOldIterFlag; } @@ -548,7 +548,7 @@ void SwUndoReplace::Redo( SwUndoIter& rUndoIter ) aArr[ nAktPos ]->Redo( rUndoIter ); - if( ++nAktPos >= aArr.Count() ) // alten Status wieder zurueck + if( ++nAktPos >= aArr.Count() ) // alten Status wieder zurueck { nAktPos = USHRT_MAX; rUndoIter.bWeiter = bOldIterFlag; diff --git a/sw/source/core/undo/unmove.cxx b/sw/source/core/undo/unmove.cxx index 4c5fbca4085c..d786c6eca266 100644 --- a/sw/source/core/undo/unmove.cxx +++ b/sw/source/core/undo/unmove.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include <doc.hxx> #include <pam.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <ndtxt.hxx> #include <undobj.hxx> #include <rolbck.hxx> @@ -114,7 +114,7 @@ SwUndoMove::SwUndoMove( SwDoc* pDoc, const SwNodeRange& rRg, nSttNode = rRg.aStart.GetIndex(); nEndNode = rRg.aEnd.GetIndex(); -// DelFtn( rRange ); +// DelFtn( rRange ); // wird aus dem CntntBereich in den Sonderbereich verschoben ? ULONG nCntntStt = pDoc->GetNodes().GetEndOfAutotext().GetIndex(); @@ -149,13 +149,13 @@ void SwUndoMove::SetDestRange( const SwPaM& rRange, ? rRange.GetMark() : rRange.GetPoint(); - nDestSttNode = pStt->nNode.GetIndex(); - nDestSttCntnt = pStt->nContent.GetIndex(); - nDestEndNode = pEnd->nNode.GetIndex(); - nDestEndCntnt = pEnd->nContent.GetIndex(); + nDestSttNode = pStt->nNode.GetIndex(); + nDestSttCntnt = pStt->nContent.GetIndex(); + nDestEndNode = pEnd->nNode.GetIndex(); + nDestEndCntnt = pEnd->nContent.GetIndex(); nInsPosNode = rInsPos.nNode.GetIndex(); - nInsPosCntnt = rInsPos.nContent.GetIndex(); + nInsPosCntnt = rInsPos.nContent.GetIndex(); if( bCorrPam ) { @@ -238,7 +238,7 @@ void SwUndoMove::Undo( SwUndoIter& rUndoIter ) aPam.Exchange(); aPam.DeleteMark(); -// pDoc->ResetAttr( aPam, FALSE ); +// pDoc->ResetAttr( aPam, FALSE ); if( aPam.GetNode()->IsCntntNode() ) aPam.GetNode()->GetCntntNode()->ResetAllAttr(); // der Pam wird jetzt aufgegeben. diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index e7885db39b5f..11a92c6385f3 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <hintids.hxx> #include <editeng/lrspitem.hxx> #include <doc.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <undobj.hxx> @@ -274,8 +274,8 @@ SwUndoMoveNum::SwUndoMoveNum( const SwPaM& rPam, long nOff, BOOL bIsOutlMv ) SwUndRng( rPam ), nNewStt( 0 ), nOffset( nOff ) { - // nOffset: nach unten => 1 - // nach oben => -1 + // nOffset: nach unten => 1 + // nach oben => -1 } @@ -283,9 +283,9 @@ void SwUndoMoveNum::Undo( SwUndoIter& rUndoIter ) { ULONG nTmpStt = nSttNode, nTmpEnd = nEndNode; - if( nEndNode || USHRT_MAX != nEndCntnt ) // Bereich ? + if( nEndNode || USHRT_MAX != nEndCntnt ) // Bereich ? { - if( nNewStt < nSttNode ) // nach vorne verschoben + if( nNewStt < nSttNode ) // nach vorne verschoben nEndNode = nEndNode - ( nSttNode - nNewStt ); else nEndNode = nEndNode + ( nNewStt - nSttNode ); @@ -293,8 +293,8 @@ void SwUndoMoveNum::Undo( SwUndoIter& rUndoIter ) nSttNode = nNewStt; //JP 22.06.95: wird wollen die Bookmarks/Verzeichnisse behalten, oder? -// SetPaM( rUndoIter ); -// RemoveIdxFromRange( *rUndoIter.pAktPam, TRUE ); +// SetPaM( rUndoIter ); +// RemoveIdxFromRange( *rUndoIter.pAktPam, TRUE ); SetPaM( rUndoIter ); rUndoIter.GetDoc().MoveParagraph( *rUndoIter.pAktPam, -nOffset, @@ -307,8 +307,8 @@ void SwUndoMoveNum::Undo( SwUndoIter& rUndoIter ) void SwUndoMoveNum::Redo( SwUndoIter& rUndoIter ) { //JP 22.06.95: wird wollen die Bookmarks/Verzeichnisse behalten, oder? -// SetPaM( rUndoIter ); -// RemoveIdxFromRange( *rUndoIter.pAktPam, TRUE ); +// SetPaM( rUndoIter ); +// RemoveIdxFromRange( *rUndoIter.pAktPam, TRUE ); SetPaM( rUndoIter ); rUndoIter.GetDoc().MoveParagraph( *rUndoIter.pAktPam, nOffset, @@ -332,8 +332,8 @@ SwUndoNumUpDown::SwUndoNumUpDown( const SwPaM& rPam, short nOff ) : SwUndo( nOff > 0 ? UNDO_NUMUP : UNDO_NUMDOWN ), SwUndRng( rPam ), nOffset( nOff ) { - // nOffset: Down => 1 - // Up => -1 + // nOffset: Down => 1 + // Up => -1 } diff --git a/sw/source/core/undo/unoutl.cxx b/sw/source/core/undo/unoutl.cxx index 2a92097221b6..c519cb293899 100644 --- a/sw/source/core/undo/unoutl.cxx +++ b/sw/source/core/undo/unoutl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #include "doc.hxx" -#include "swundo.hxx" // fuer die UndoIds +#include "swundo.hxx" // fuer die UndoIds #include "pam.hxx" #include "ndtxt.hxx" diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index 8254d431b079..744767ffcb86 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <unotools/transliterationwrapper.hxx> #include <comphelper/processfactory.hxx> #include <doc.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <undobj.hxx> @@ -53,9 +53,9 @@ using namespace ::com::sun::star::uno; // zwei Zugriffs-Funktionen inline SwPosition* IterPt( SwUndoIter& rUIter ) -{ return rUIter.pAktPam->GetPoint(); } +{ return rUIter.pAktPam->GetPoint(); } inline SwPosition* IterMk( SwUndoIter& rUIter ) -{ return rUIter.pAktPam->GetMark(); } +{ return rUIter.pAktPam->GetMark(); } inline SwDoc& SwUndoIter::GetDoc() const { return *pAktPam->GetDoc(); } @@ -87,7 +87,7 @@ SwUndoOverwrite::SwUndoOverwrite( SwDoc* pDoc, SwPosition& rPos, bInsChar = TRUE; xub_StrLen nTxtNdLen = pTxtNd->GetTxt().Len(); - if( nSttCntnt < nTxtNdLen ) // kein reines Einfuegen ? + if( nSttCntnt < nTxtNdLen ) // kein reines Einfuegen ? { aDelStr.Insert( pTxtNd->GetTxt().GetChar( nSttCntnt ) ); if( !pHistory ) @@ -352,16 +352,14 @@ SwRewriter SwUndoOverwrite::GetRewriter() const struct _UndoTransliterate_Data { - String sText; - _UndoTransliterate_Data* pNext; - SwHistory* pHistory; - Sequence <sal_Int32>* pOffsets; - ULONG nNdIdx; - xub_StrLen nStart, nLen; - - _UndoTransliterate_Data( ULONG nNd, xub_StrLen nStt, xub_StrLen nStrLen, - const String& rTxt ) - : sText( rTxt ), pNext( 0 ), pHistory( 0 ), pOffsets( 0 ), + String sText; + SwHistory* pHistory; + Sequence< sal_Int32 >* pOffsets; + ULONG nNdIdx; + xub_StrLen nStart, nLen; + + _UndoTransliterate_Data( ULONG nNd, xub_StrLen nStt, xub_StrLen nStrLen, const String& rTxt ) + : sText( rTxt ), pHistory( 0 ), pOffsets( 0 ), nNdIdx( nNd ), nStart( nStt ), nLen( nStrLen ) {} ~_UndoTransliterate_Data() { delete pOffsets; delete pHistory; } @@ -369,22 +367,17 @@ struct _UndoTransliterate_Data void SetChangeAtNode( SwDoc& rDoc ); }; -SwUndoTransliterate::SwUndoTransliterate( const SwPaM& rPam, - const utl::TransliterationWrapper& rTrans ) - : SwUndo( UNDO_TRANSLITERATE ), SwUndRng( rPam ), - pData( 0 ), pLastData( 0 ), nType( rTrans.getType() ) +SwUndoTransliterate::SwUndoTransliterate( + const SwPaM& rPam, + const utl::TransliterationWrapper& rTrans ) + : SwUndo( UNDO_TRANSLITERATE ), SwUndRng( rPam ), nType( rTrans.getType() ) { } SwUndoTransliterate::~SwUndoTransliterate() { - _UndoTransliterate_Data* pD = pData; - while( pD ) - { - pData = pD; - pD = pD->pNext; - delete pData; - } + for (size_t i = 0; i < aChanges.size(); ++i) + delete aChanges[i]; } void SwUndoTransliterate::Undo( SwUndoIter& rUndoIter ) @@ -393,8 +386,12 @@ void SwUndoTransliterate::Undo( SwUndoIter& rUndoIter ) BOOL bUndo = rDoc.DoesUndo(); rDoc.DoUndo( FALSE ); - for( _UndoTransliterate_Data* pD = pData; pD; pD = pD->pNext ) - pD->SetChangeAtNode( rDoc ); + // since the changes were added to the vector from the end of the string/node towards + // the start, we need to revert them from the start towards the end now to keep the + // offset information of the undo data in sync with the changing text. + // Thus we need to iterate from the end of the vector to the start + for (sal_Int32 i = aChanges.size() - 1; i >= 0; --i) + aChanges[i]->SetChangeAtNode( rDoc ); rDoc.DoUndo( bUndo ); SetPaM( rUndoIter, TRUE ); @@ -402,7 +399,7 @@ void SwUndoTransliterate::Undo( SwUndoIter& rUndoIter ) void SwUndoTransliterate::Redo( SwUndoIter& rUndoIter ) { -/* ??? */ rUndoIter.SetUpdateAttr( TRUE ); +/* ??? */ rUndoIter.SetUpdateAttr( TRUE ); SetPaM( *rUndoIter.pAktPam ); Repeat( rUndoIter ); @@ -413,8 +410,7 @@ void SwUndoTransliterate::Repeat( SwUndoIter& rUndoIter ) SwPaM& rPam = *rUndoIter.pAktPam; SwDoc& rDoc = rUndoIter.GetDoc(); - utl::TransliterationWrapper aTrans( - ::comphelper::getProcessServiceFactory(), nType ); + utl::TransliterationWrapper aTrans( ::comphelper::getProcessServiceFactory(), nType ); rDoc.TransliterateText( rPam, aTrans ); rUndoIter.pLastUndoObj = this; @@ -428,67 +424,63 @@ void SwUndoTransliterate::AddChanges( SwTxtNode& rTNd, _UndoTransliterate_Data* pNew = new _UndoTransliterate_Data( rTNd.GetIndex(), nStart, (xub_StrLen)nOffsLen, rTNd.GetTxt().Copy( nStart, nLen )); - if( pData ) - pLastData->pNext = pNew; - else - pData = pNew; - pLastData = pNew; + + aChanges.push_back( pNew ); const sal_Int32* pOffsets = rOffsets.getConstArray(); // where did we need less memory ? const sal_Int32* p = pOffsets; for( long n = 0; n < nOffsLen; ++n, ++p ) - if( *p != ( nStart + n )) + if( *p != ( nStart + n )) + { + // create the Offset array + pNew->pOffsets = new Sequence <sal_Int32> ( nLen ); + sal_Int32* pIdx = pNew->pOffsets->getArray(); + p = pOffsets; + long nMyOff, nNewVal = nStart; + for( n = 0, nMyOff = nStart; n < nOffsLen; ++p, ++n, ++nMyOff ) { - // create the Offset array - pNew->pOffsets = new Sequence <sal_Int32> ( nLen ); - sal_Int32* pIdx = pNew->pOffsets->getArray(); - p = pOffsets; - long nMyOff, nNewVal = nStart; - for( n = 0, nMyOff = nStart; n < nOffsLen; ++p, ++n, ++nMyOff ) + if( *p < nMyOff ) { - if( *p < nMyOff ) - { - // something is deleted - nMyOff = *p; - *(pIdx-1) = nNewVal++; - } - else if( *p > nMyOff ) - { - for( ; *p > nMyOff; ++nMyOff ) - *pIdx++ = nNewVal; - --nMyOff; - --n; - --p; - } - else - *pIdx++ = nNewVal++; + // something is deleted + nMyOff = *p; + *(pIdx-1) = nNewVal++; } - - // and then we need to save the attributes/bookmarks - // but this data must moved every time to the last in the chain! - _UndoTransliterate_Data* pD = pData; - while( pD != pNew ) + else if( *p > nMyOff ) { - if( pD->nNdIdx == pNew->nNdIdx && pD->pHistory ) - { - // same node and have a history? - pNew->pHistory = pD->pHistory; - pD->pHistory = 0; - break; // more can't exist - } - pD = pD->pNext; + for( ; *p > nMyOff; ++nMyOff ) + *pIdx++ = nNewVal; + --nMyOff; + --n; + --p; } + else + *pIdx++ = nNewVal++; + } - if( !pNew->pHistory ) + // and then we need to save the attributes/bookmarks + // but this data must moved every time to the last in the chain! + for (size_t i = 0; i + 1 < aChanges.size(); ++i) // check all changes but not the current one + { + _UndoTransliterate_Data* pD = aChanges[i]; + if( pD->nNdIdx == pNew->nNdIdx && pD->pHistory ) { - pNew->pHistory = new SwHistory; - SwRegHistory aRHst( rTNd, pNew->pHistory ); - pNew->pHistory->CopyAttr( rTNd.GetpSwpHints(), - pNew->nNdIdx, 0, rTNd.GetTxt().Len(), false ); + // same node and have a history? + pNew->pHistory = pD->pHistory; + pD->pHistory = 0; + break; // more can't exist } - break; } + + if( !pNew->pHistory ) + { + pNew->pHistory = new SwHistory; + SwRegHistory aRHst( rTNd, pNew->pHistory ); + pNew->pHistory->CopyAttr( rTNd.GetpSwpHints(), + pNew->nNdIdx, 0, rTNd.GetTxt().Len(), false ); + } + break; + } } void _UndoTransliterate_Data::SetChangeAtNode( SwDoc& rDoc ) diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx index 7f76697c80a3..b2a7442f8e65 100644 --- a/sw/source/core/undo/unredln.cxx +++ b/sw/source/core/undo/unredln.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <hintids.hxx> #include <unotools/charclass.hxx> #include <doc.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <undobj.hxx> @@ -79,8 +79,8 @@ SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange ) else { bHiddenRedlines = HasHiddenRedlines( *pRedlSaveData ); - if( bHiddenRedlines ) // dann muessen die NodeIndizies - { // vom SwUndRng korrigiert werden + if( bHiddenRedlines ) // dann muessen die NodeIndizies + { // vom SwUndRng korrigiert werden nEndExtra -= rDoc.GetNodes().GetEndOfExtras().GetIndex(); nSttNode -= nEndExtra; nEndNode -= nEndExtra; @@ -302,7 +302,7 @@ void SwUndoRedlineSort::_Redo( SwUndoIter& rIter ) SwNodeIndex aPrevIdx( pStart->nNode, -1 ); ULONG nOffsetTemp = pEnd->nNode.GetIndex() - pStart->nNode.GetIndex(); - xub_StrLen nCntStt = pStart->nContent.GetIndex(); + xub_StrLen nCntStt = pStart->nContent.GetIndex(); rIter.GetDoc().SortText( rPam, *pOpt ); @@ -516,8 +516,8 @@ void SwUndoCompDoc::Redo( SwUndoIter& rIter ) } else { -// SwRedlineMode eOld = pDoc->GetRedlineMode(); -// pDoc->SetRedlineMode_intern( ( eOld & ~REDLINE_IGNORE) | REDLINE_ON ); +// SwRedlineMode eOld = pDoc->GetRedlineMode(); +// pDoc->SetRedlineMode_intern( ( eOld & ~REDLINE_IGNORE) | REDLINE_ON ); if( pUnDel2 ) { @@ -534,7 +534,7 @@ void SwUndoCompDoc::Redo( SwUndoIter& rIter ) if (pTmp) // #i19649# pTmp->InvalidateRange(); -// pDoc->SetRedlineMode_intern( eOld ); +// pDoc->SetRedlineMode_intern( eOld ); } SetPaM( rIter, TRUE ); diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index 98d0e41d4616..5311f8ca8cca 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <fmtcntnt.hxx> #include <doc.hxx> #include <docary.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <undobj.hxx> diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx index 44b73736e458..9405a491c83a 100644 --- a/sw/source/core/undo/unsort.cxx +++ b/sw/source/core/undo/unsort.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" #include <doc.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <swtable.hxx> #include <ndtxt.hxx> @@ -96,7 +96,7 @@ SwUndoSort::~SwUndoSort() void SwUndoSort::Undo( SwUndoIter& rIter) { - SwDoc& rDoc = rIter.GetDoc(); + SwDoc& rDoc = rIter.GetDoc(); if(pSortOpt->bTable) { // Undo Tabelle @@ -145,7 +145,7 @@ void SwUndoSort::Undo( SwUndoIter& rIter) // fuer die sorted Positions einen Index anlegen. // JP 25.11.97: Die IndexList muss aber nach SourcePosition - // aufsteigend sortiert aufgebaut werden + // aufsteigend sortiert aufgebaut werden SwUndoSortList aIdxList( (BYTE)aSortList.Count() ); USHORT i; @@ -226,7 +226,7 @@ void SwUndoSort::Redo( SwUndoIter& rIter) USHORT i; for( i = 0; i < aSortList.Count(); ++i) - { // aktuelle Pos ist die Ausgangslage + { // aktuelle Pos ist die Ausgangslage SwNodeIndex* pIdx = new SwNodeIndex( rDoc.GetNodes(), aSortList[i]->SORT_TXT_TBL.TXT.nSource); aIdxList.C40_INSERT( SwNodeIndex, pIdx, i ); diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx index 14aa18ed6e07..e304bd499e24 100644 --- a/sw/source/core/undo/unspnd.cxx +++ b/sw/source/core/undo/unspnd.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index f66cae89ce21..aaf0efd6551a 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #include <pam.hxx> #include <cntfrm.hxx> #include <tblsel.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <undobj.hxx> #include <rolbck.hxx> #include <ddefld.hxx> @@ -195,7 +195,7 @@ void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos = 0 ); #include "shellio.hxx" void DumpDoc( SwDoc* pDoc, const String& rFileNm ); void CheckTable( const SwTable& ); -#define DUMPDOC(p,s) DumpDoc( p, s); +#define DUMPDOC(p,s) DumpDoc( p, s); #define CHECKTABLE(t) CheckTable( t ); #else #define DUMPDOC(p,s) @@ -231,7 +231,7 @@ SV_IMPL_PTRARR( _UndoTblCpyTbl_Entries, _UndoTblCpyTbl_EntryPtr ) USHORT __FAR_DATA aSave_BoxCntntSet[] = { RES_CHRATR_COLOR, RES_CHRATR_CROSSEDOUT, RES_CHRATR_FONT, RES_CHRATR_FONTSIZE, - RES_CHRATR_POSTURE, RES_CHRATR_POSTURE, + RES_CHRATR_POSTURE, RES_CHRATR_POSTURE, RES_CHRATR_SHADOWED, RES_CHRATR_WEIGHT, RES_PARATR_ADJUST, RES_PARATR_ADJUST, 0 }; @@ -337,7 +337,7 @@ void SwUndoInsTbl::Redo( SwUndoIter& rUndoIter ) SwDDEFieldType* pNewType = (SwDDEFieldType*)rDoc.InsertFldType( *pDDEFldType); SwDDETable* pDDETbl = new SwDDETable( pTblNode->GetTable(), pNewType ); - pTblNode->SetNewTable( pDDETbl ); // setze die DDE-Tabelle + pTblNode->SetNewTable( pDDETbl ); // setze die DDE-Tabelle delete pDDEFldType, pDDEFldType = 0; } @@ -494,7 +494,7 @@ void SwUndoTblToTxt::Undo( SwUndoIter& rUndoIter ) SwTableNode* pTblNd = rDoc.GetNodes().UndoTableToText( nSttNd, nEndNd, *pBoxSaves ); pTblNd->GetTable().SetTableModel( pTblSave->IsNewModel() ); SwTableFmt* pTableFmt = rDoc.MakeTblFrmFmt( sTblNm, rDoc.GetDfltFrmFmt() ); - pTableFmt->Add( &pTblNd->GetTable() ); // das Frame-Format setzen + pTableFmt->Add( &pTblNd->GetTable() ); // das Frame-Format setzen pTblNd->GetTable().SetRowsToRepeat( nHdlnRpt ); // erzeuge die alte Tabellen Struktur @@ -505,7 +505,7 @@ void SwUndoTblToTxt::Undo( SwUndoIter& rUndoIter ) SwDDEFieldType* pNewType = (SwDDEFieldType*)rDoc.InsertFldType( *pDDEFldType); SwDDETable* pDDETbl = new SwDDETable( pTblNd->GetTable(), pNewType ); - pTblNd->SetNewTable( pDDETbl, FALSE ); // setze die DDE-Tabelle + pTblNd->SetNewTable( pDDETbl, FALSE ); // setze die DDE-Tabelle delete pDDEFldType, pDDEFldType = 0; } @@ -751,7 +751,7 @@ void SwUndoTxtToTbl::Undo( SwUndoIter& rUndoIter ) ULONG nTblNd = nSttNode; if( nSttCntnt ) - ++nTblNd; // Node wurde vorher gesplittet + ++nTblNd; // Node wurde vorher gesplittet SwNodeIndex aIdx( rDoc.GetNodes(), nTblNd ); SwTableNode* pTNd = rDoc.GetNodes()[ aIdx ]->GetTableNode(); ASSERT( pTNd, "keinen Tabellen-Node gefunden" ); @@ -819,7 +819,7 @@ void SwUndoTxtToTbl::Undo( SwUndoIter& rUndoIter ) } } - SetPaM( rUndoIter ); // manipulierten Bereich selectieren + SetPaM( rUndoIter ); // manipulierten Bereich selectieren } @@ -944,8 +944,8 @@ USHORT _SaveTable::AddFmt( SwFrmFmt* pFmt, bool bIsLine ) bIsLine ? aTableLineSetRange : aTableBoxSetRange ); pSet->Put( pFmt->GetAttrSet() ); //JP 20.04.98: Bug 49502 - wenn eine Formel gesetzt ist, nie den - // Value mit sichern. Der muss gegebenfalls neu - // errechnet werden! + // Value mit sichern. Der muss gegebenfalls neu + // errechnet werden! //JP 30.07.98: Bug 54295 - Formeln immer im Klartext speichern const SfxPoolItem* pItem; if( SFX_ITEM_SET == pSet->GetItemState( RES_BOXATR_FORMULA, TRUE, &pItem )) @@ -1278,7 +1278,7 @@ _SaveBox::_SaveBox( _SaveBox* pPrev, const SwTableBox& rBox, _SaveTable& rSTbl ) _SaveBox::~_SaveBox() { - if( ULONG_MAX == nSttNode ) // keine EndBox + if( ULONG_MAX == nSttNode ) // keine EndBox delete Ptrs.pLine; else delete Ptrs.pCntntAttrs; @@ -1290,7 +1290,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl ) { rSTbl.NewFrmFmt( &rBox, FALSE, nItemSet, rBox.GetFrmFmt() ); - if( ULONG_MAX == nSttNode ) // keine EndBox + if( ULONG_MAX == nSttNode ) // keine EndBox { if( !rBox.GetTabLines().Count() ) { @@ -1349,7 +1349,7 @@ void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl ) void _SaveBox::SaveCntntAttrs( SwDoc* pDoc ) { - if( ULONG_MAX == nSttNode ) // keine EndBox + if( ULONG_MAX == nSttNode ) // keine EndBox { // weiter in der Line Ptrs.pLine->SaveCntntAttrs( pDoc ); @@ -1391,7 +1391,7 @@ void _SaveBox::CreateNew( SwTable& rTbl, SwTableLine& rParent, _SaveTable& rSTbl rSTbl.aFrmFmts.Replace( pFmt, nItemSet ); } - if( ULONG_MAX == nSttNode ) // keine EndBox + if( ULONG_MAX == nSttNode ) // keine EndBox { SwTableBox* pNew = new SwTableBox( pFmt, 1, &rParent ); rParent.GetTabBoxes().C40_INSERT( SwTableBox, pNew, rParent.GetTabBoxes().Count() ); @@ -1956,7 +1956,7 @@ void SwUndoTblNdsChg::Redo( SwUndoIter& rUndoIter ) TblChgMode eOldMode = rTbl.GetTblChgMode(); rTbl.SetTblChgMode( (TblChgMode)nCount ); - rDoc.DoUndo( TRUE ); // wir brauchen die SaveSections! + rDoc.DoUndo( TRUE ); // wir brauchen die SaveSections! SwUndoTblNdsChg* pUndo = 0; switch( nSetColType & 0xff ) @@ -2119,11 +2119,11 @@ CHECKTABLE(pTblNd->GetTable()) // das Trennzeichen loeschen pTxtNd->EraseText( aTmpIdx, 1 ); } -// delete pUndo; +// delete pUndo; DUMPDOC( &rDoc, String( "d:\\tmp\\tab_") + String( aNewSttNds.Count() - i ) + String(".db") ) } -// pMoves->Remove( 0, pMoves->Count() ); +// pMoves->Remove( 0, pMoves->Count() ); nIdx = pBox->GetSttIdx(); } else @@ -2165,7 +2165,7 @@ CHECKTABLE(pTblNd->GetTable()) pHistory->TmpRollback( &rDoc, 0 ); pHistory->SetTmpEnd( pHistory->Count() ); } -// nTblNode = pTblNd->GetIndex(); +// nTblNode = pTblNd->GetIndex(); SwPaM* pPam = rUndoIter.pAktPam; pPam->DeleteMark(); @@ -2421,14 +2421,14 @@ void SwUndoTblNumFmt::Redo( SwUndoIter& rIter ) ASSERT( pBox, "keine TabellenBox gefunden" ); SwFrmFmt* pBoxFmt = pBox->ClaimFrmFmt(); - if( bNewFmt || bNewFml || bNewValue ) + if( bNewFmt || bNewFml || bNewValue ) { SfxItemSet aBoxSet( rDoc.GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE ); // JP 15.01.99: Nur Attribute zuruecksetzen reicht nicht. - // Sorge dafuer, das der Text auch entsprechend - // formatiert wird! + // Sorge dafuer, das der Text auch entsprechend + // formatiert wird! pBoxFmt->LockModify(); if( bNewFml ) @@ -2460,8 +2460,8 @@ void SwUndoTblNumFmt::Redo( SwUndoIter& rIter ) aBoxSet.Put( SwTblBoxValue( fNum )); // JP 15.01.99: Nur Attribute zuruecksetzen reicht nicht. - // Sorge dafuer, das der Text auch entsprechend - // formatiert wird! + // Sorge dafuer, das der Text auch entsprechend + // formatiert wird! pBoxFmt->LockModify(); pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMULA ); pBoxFmt->UnlockModify(); @@ -2477,8 +2477,8 @@ void SwUndoTblNumFmt::Redo( SwUndoIter& rIter ) // es ist keine Zahl // JP 15.01.99: Nur Attribute zuruecksetzen reicht nicht. - // Sorge dafuer, das der Text auch entsprechend - // formatiert wird! + // Sorge dafuer, das der Text auch entsprechend + // formatiert wird! pBoxFmt->SetFmtAttr( *GetDfltAttr( RES_BOXATR_FORMAT )); pBoxFmt->ResetFmtAttr( RES_BOXATR_FORMAT, RES_BOXATR_VALUE ); @@ -3130,7 +3130,7 @@ void SwUndoMergeTbl::Undo( SwUndoIter& rIter ) pTbl = &pNew->GetTable(); pTbl->GetFrmFmt()->SetName( aName ); -// pSavTbl->CreateNew( *pTbl, FALSE ); +// pSavTbl->CreateNew( *pTbl, FALSE ); pSavTbl->RestoreAttr( *pTbl ); @@ -3197,7 +3197,7 @@ void SwUndoMergeTbl::SaveFormula( SwHistory& rHistory ) void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos ) { - USHORT nO = rArr.Count(), nM, nU = 0; + USHORT nO = rArr.Count(), nM, nU = 0; if( nO > 0 ) { nO--; @@ -3224,7 +3224,7 @@ void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos ) void InsertSort( SvULongs& rArr, ULONG nIdx, USHORT* pInsPos ) { - USHORT nO = rArr.Count(), nM, nU = 0; + USHORT nO = rArr.Count(), nM, nU = 0; if( nO > 0 ) { nO--; diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx index e9e7ce1e0e02..4893f6a90a96 100644 --- a/sw/source/core/undo/untblk.cxx +++ b/sw/source/core/undo/untblk.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include <frmfmt.hxx> #include <doc.hxx> #include <docary.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <pam.hxx> #include <ndtxt.hxx> #include <undobj.hxx> @@ -60,7 +60,7 @@ SwUndoInserts::SwUndoInserts( SwUndoId nUndoId, const SwPaM& rPam ) if( pTxtNd->HasSwAttrSet() ) pHistory->CopyFmtAttr( *pTxtNd->GetpSwAttrSet(), nSttNode ); - if( !nSttCntnt ) // dann werden Flys mitgenommen !! + if( !nSttCntnt ) // dann werden Flys mitgenommen !! { USHORT nArrLen = pDoc->GetSpzFrmFmts()->Count(); for( USHORT n = 0; n < nArrLen; ++n ) @@ -105,9 +105,9 @@ void SwUndoInserts::SetInsertRange( const SwPaM& rPam, BOOL bScanFlys, nSttNode = pTmpPos->nNode.GetIndex(); nSttCntnt = pTmpPos->nContent.GetIndex(); - if( !bSttIsTxtNd ) // wird eine Tabellenselektion eingefuegt, + if( !bSttIsTxtNd ) // wird eine Tabellenselektion eingefuegt, { - ++nSttNode; // dann stimmt der CopyPam nicht ganz + ++nSttNode; // dann stimmt der CopyPam nicht ganz bSttWasTxtNd = FALSE; } } @@ -146,11 +146,11 @@ void SwUndoInserts::SetInsertRange( const SwPaM& rPam, BOOL bScanFlys, SwUndoInserts::~SwUndoInserts() { - if( pPos ) // loesche noch den Bereich aus dem UndoNodes Array + if( pPos ) // loesche noch den Bereich aus dem UndoNodes Array { // Insert speichert den Inhalt in der IconSection SwNodes& rUNds = pPos->nNode.GetNodes(); - if( pPos->nContent.GetIndex() ) // nicht den gesamten Node loeschen + if( pPos->nContent.GetIndex() ) // nicht den gesamten Node loeschen { SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode(); ASSERT( pTxtNd, "kein TextNode, aus dem geloescht werden soll" ); @@ -230,7 +230,7 @@ void SwUndoInserts::Undo( SwUndoIter& rUndoIter ) SwTxtNode* pTxtNode = rIdx.GetNode().GetTxtNode(); if( pTxtNode ) { - if( !pTxtFmtColl ) // falls 0, dann war hier auch kein TextNode, + if( !pTxtFmtColl ) // falls 0, dann war hier auch kein TextNode, { // dann muss dieser geloescht werden, SwNodeIndex aDelIdx( rIdx ); rIdx++; |