diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-28 16:29:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-28 16:45:35 +0100 |
| commit | 057d8abebb19fedd769a43120621488ba305cf93 (patch) | |
| tree | 189bbc86d89db61ef132bade3cb9d2d092c4f017 /sd/source | |
| parent | sw lok: fix one view inserting a comment, other view jumping there as well (diff) | |
| download | core-057d8abebb19fedd769a43120621488ba305cf93.tar.gz core-057d8abebb19fedd769a43120621488ba305cf93.zip | |
Resolves: tdf#102343 unable to undo stylesheet changes in master...
slides done via proxy textbox objects
regression since...
commit 12a4200e8ff7f045efcc7e9d15a24b15b248c437
Author: Armin Le Grand <alg@apache.org>
Date: Thu Aug 9 08:42:27 2012 +0000
Related: #i120498# Enhanced Undo/Redo and user experience...
when editing texts in graphic objects and/or tables
The issue is that the formatting changes in these master textboxes create
changes in the stylesheet, rather than just changes in the textbox itself and
the changes above don't take that into account and throw away these unusual
undo objects.
Change-Id: I209758cefa96b2f886161de1d44d6a68d007faa7
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 92fc471bb1a6..f1e46bc66097 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -413,6 +413,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) SetAppBackgroundColor( aFillColor ); SwitchPage(nActualPageNum); + + //tdf#102343 re-enable common undo on switch back from master mode + mpDrawView->GetModel()->SetDisableTextEditUsesCommonUndoManager(false); } else { @@ -453,6 +456,12 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) maTabControl->SetCurPageId(nActualMasterPageNum + 1); SwitchPage(nActualMasterPageNum); + + //tdf#102343 changing attributes of textboxes in master typically + //changes the stylesheet they are linked to, so if the common + //undo manager is in use, those stylesheet changes are thrown + //away at present + mpDrawView->GetModel()->SetDisableTextEditUsesCommonUndoManager(true); } // If the master view toolbar is to be shown we turn it on after the |