summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells/annotsh.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-11-25 14:31:10 +0100
committerMichael Stahl <mst@openoffice.org>2010-11-25 14:31:10 +0100
commite4bb13bc4e808118ef1f73503cdc75e16c873191 (patch)
tree856a4a9a315e3f4e6e8ceb978ef5a104cd4baf0a /sw/source/ui/shells/annotsh.cxx
parent5a890bc44e8053880ad445d60023e95c61357a52 (diff)
unodapi: #i115383#: remove clutter from IDocumentUndoRedo:
remove methods GetUndoIdsStr(), GetRedoIdsStr(), GetRepeatIdsStr(). remove unused parameter from GetRepeatIds().
Diffstat (limited to 'sw/source/ui/shells/annotsh.cxx')
-rwxr-xr-xsw/source/ui/shells/annotsh.cxx14
1 files changed, 10 insertions, 4 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 8115b4ec7438..3df64efba322 100755
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -1448,8 +1448,10 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
sal_uInt16 nCount = pUndoManager->GetUndoActionCount();
if ( nCount )
pSfxViewFrame->GetSlotState( nWhich, pSfxViewFrame->GetInterface(), &rSet );
- else if( rSh.GetUndoIds() )
+ else if (UNDO_EMPTY != rSh.GetUndoIds())
+ {
rSet.Put( SfxStringItem( nWhich, rSh.GetDoString(SwWrtShell::UNDO)) );
+ }
else
rSet.DisableItem(nWhich);
break;
@@ -1459,8 +1461,10 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
sal_uInt16 nCount = pUndoManager->GetRedoActionCount();
if ( nCount )
pSfxViewFrame->GetSlotState( nWhich, pSfxViewFrame->GetInterface(), &rSet );
- else if(rSh.GetRedoIds())
+ else if (UNDO_EMPTY != rSh.GetRedoIds())
+ {
rSet.Put(SfxStringItem( nWhich, rSh.GetDoString(SwWrtShell::REDO)) );
+ }
else
rSet.DisableItem(nWhich);
break;
@@ -1493,11 +1497,13 @@ void SwAnnotationShell::StateUndo(SfxItemSet &rSet)
}
SfxStringListItem aItem( nWhich );
- if( nWhich == SID_GETUNDOSTRINGS && rSh.GetUndoIds() )
+ if ((nWhich == SID_GETUNDOSTRINGS) &&
+ (UNDO_EMPTY != rSh.GetUndoIds()))
{
rSh.GetDoStrings( SwWrtShell::UNDO, aItem );
}
- else if( nWhich == SID_GETREDOSTRINGS && rSh.GetRedoIds() )
+ else if ((nWhich == SID_GETREDOSTRINGS) &&
+ (UNDO_EMPTY != rSh.GetRedoIds()))
{
rSh.GetDoStrings( SwWrtShell::UNDO, aItem );
}