diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-01 17:35:23 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-08-01 17:04:45 +0000 |
| commit | 4cbaa49c0ee707a2e1e1d842279b32473e8c8a28 (patch) | |
| tree | dc5fa102c9e8f8dbe68d18290607ee73d365ff1e /sd/source/ui/func/fubullet.cxx | |
| parent | 2e3bc9fcee1c728d9fe91cbdf92b15d090c2b619 (diff) | |
svl: implement SfxUndoAction::GetViewShellId() interface in SfxListUndoAction
Client code in sw, sd, sc and svx is adapted, the rest is just a
placeholder for now.
With this, e.g. the undo item for Writer's insert comment properly
tracks which window was used for the insertion.
Change-Id: Idad587e6ca07ba69bf59aa7013b251af8bf95bab
Reviewed-on: https://gerrit.libreoffice.org/27781
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sd/source/ui/func/fubullet.cxx')
| -rw-r--r-- | sd/source/ui/func/fubullet.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index f03dfa544f20..ac1b89fa5ba1 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -25,6 +25,7 @@ #include <editeng/fontitem.hxx> #include "OutlineViewShell.hxx" #include "DrawViewShell.hxx" +#include "ViewShellBase.hxx" #include "Window.hxx" #include "drawdoc.hxx" #include "strings.hrc" @@ -128,7 +129,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) // prepare undo ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager(); rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR), - "", 0 ); + "", 0, mpViewShell->GetViewShellBase().GetViewShellId() ); // insert given text OUString aStr( cMark ); @@ -255,8 +256,9 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) aOldSet.Put( pOV->GetAttribs() ); ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager(); + int nViewShellId = mpViewShell ? mpViewShell->GetViewShellBase().GetViewShellId() : -1; rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR), - "", 0 ); + "", 0, nViewShellId ); pOV->InsertText(aChars, true); // set attributes (set font) |