[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Jul 28 10:41:55 UTC 2016
sw/source/uibase/shells/basesh.cxx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 9e903fc1d477e2f65653b36364de0c46a5151955
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Jul 28 10:34:38 2016 +0200
sw: rename generic rSh in SwBaseShell::ExecUndo()
So that it's a bit more obvious it's not a base shell nor a view shell.
Change-Id: I723a6394c59f4013576e3c4e2ff3016369d2227c
Reviewed-on: https://gerrit.libreoffice.org/27616
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 041b8ea..4d29c40 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -475,7 +475,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
void SwBaseShell::ExecUndo(SfxRequest &rReq)
{
- SwWrtShell &rSh = GetShell();
+ SwWrtShell &rWrtShell = GetShell();
sal_uInt16 nId = rReq.GetSlot(), nCnt = 1;
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -489,19 +489,19 @@ void SwBaseShell::ExecUndo(SfxRequest &rReq)
switch( nId )
{
case SID_UNDO:
- rSh.LockPaint();
- rSh.Do( SwWrtShell::UNDO, nCnt );
- rSh.UnlockPaint();
+ rWrtShell.LockPaint();
+ rWrtShell.Do( SwWrtShell::UNDO, nCnt );
+ rWrtShell.UnlockPaint();
break;
case SID_REDO:
- rSh.LockPaint();
- rSh.Do( SwWrtShell::REDO, nCnt );
- rSh.UnlockPaint();
+ rWrtShell.LockPaint();
+ rWrtShell.Do( SwWrtShell::REDO, nCnt );
+ rWrtShell.UnlockPaint();
break;
case SID_REPEAT:
- rSh.Do( SwWrtShell::REPEAT );
+ rWrtShell.Do( SwWrtShell::REPEAT );
break;
default:
OSL_FAIL("wrong Dispatcher");
More information about the Libreoffice-commits
mailing list