Kaydet (Commit) 057d8abe authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#102343 unable to undo stylesheet changes in master...

slides done via proxy textbox objects

regression since...

commit 12a4200e
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
üst 7fd1516e
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment