summaryrefslogtreecommitdiff
path: root/sw/source/core/undo/SwUndoFmt.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-12-15 09:14:06 +0100
committerMichael Stahl <mst@openoffice.org>2010-12-15 09:14:06 +0100
commit3352d4459f39ac2d80d9d5782c37e73fbede0d08 (patch)
tree97d3759143961adfd38a10b0c47ddf667c90b757 /sw/source/core/undo/SwUndoFmt.cxx
parent64602c20b7e1933be3ce4094ee5878ac873fdd20 (diff)
undoapi: #i115383#: remove unnecessary UndoGuards:
implementations of Undo() and Redo() on SwUndo subclasses are always called with Undo disabled from UndoManager::Undo()/Redo().
Diffstat (limited to 'sw/source/core/undo/SwUndoFmt.cxx')
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx15
1 files changed, 0 insertions, 15 deletions
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index 9efc5830e6aa..00518539a8ae 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -72,7 +72,6 @@ void SwUndoFmtCreate::Undo(SwUndoIter &)
nId = pNew->GetPoolFmtId() & COLL_GET_RANGE_BITS;
bAuto = pNew->IsAuto();
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
Delete();
}
}
@@ -80,8 +79,6 @@ void SwUndoFmtCreate::Undo(SwUndoIter &)
void SwUndoFmtCreate::Redo(SwUndoIter &)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-
SwFmt * pDerivedFrom = Find(sDerivedFrom);
SwFmt * pFmt = Create(pDerivedFrom);
@@ -128,8 +125,6 @@ SwUndoFmtDelete::~SwUndoFmtDelete()
void SwUndoFmtDelete::Undo(SwUndoIter &)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-
SwFmt * pDerivedFrom = Find(sDerivedFrom);
SwFmt * pFmt = Create(pDerivedFrom);
@@ -150,7 +145,6 @@ void SwUndoFmtDelete::Redo(SwUndoIter &)
if (pOld)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
Delete(pOld);
}
}
@@ -184,7 +178,6 @@ void SwUndoRenameFmt::Undo(SwUndoIter &)
if (pFmt)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
pDoc->RenameFmt(*pFmt, sOldName, TRUE);
}
}
@@ -195,7 +188,6 @@ void SwUndoRenameFmt::Redo(SwUndoIter &)
if (pFmt)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
pDoc->RenameFmt(*pFmt, sNewName, TRUE);
}
}
@@ -383,8 +375,6 @@ SwUndoNumruleCreate::SwUndoNumruleCreate(const SwNumRule * _pNew,
void SwUndoNumruleCreate::Undo(SwUndoIter &)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-
if (! bInitialized)
{
aNew = *pNew;
@@ -396,7 +386,6 @@ void SwUndoNumruleCreate::Undo(SwUndoIter &)
void SwUndoNumruleCreate::Redo(SwUndoIter &)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
pDoc->MakeNumRule(aNew.GetName(), &aNew, TRUE);
}
@@ -423,13 +412,11 @@ SwUndoNumruleDelete::SwUndoNumruleDelete(const SwNumRule & rRule,
void SwUndoNumruleDelete::Undo(SwUndoIter &)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
pDoc->MakeNumRule(aOld.GetName(), &aOld, TRUE);
}
void SwUndoNumruleDelete::Redo(SwUndoIter &)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
pDoc->DelNumRule(aOld.GetName(), TRUE);
}
@@ -452,13 +439,11 @@ SwUndoNumruleRename::SwUndoNumruleRename(const String & _aOldName,
void SwUndoNumruleRename::Undo(SwUndoIter &)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
pDoc->RenameNumRule(aNewName, aOldName, TRUE);
}
void SwUndoNumruleRename::Redo(SwUndoIter &)
{
- ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
pDoc->RenameNumRule(aOldName, aNewName, TRUE);
}