mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#88128 fix unevaluated undo variable: autocorrect

Browse Source 
When replacing a selection with an autocorrect character
(like space, *, _) in Writer, the undo/redo remark
was "Insert $1" on Linux/Mac.

Change-Id: I2e7be035ec1cc107458cc30c14174a22fa31c075
Reviewed-on: https://gerrit.libreoffice.org/19069
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Justin Luth
2015-10-01 10:57:33 +03:00
committed by Caolán McNamara
parent 39a438dec5
commit 329e6f1a03
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sw/source/uibase/wrtsh/wrtsh1.cxx
View File

@@ -1588,12 +1588,27 @@ void SwWrtShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar )
if(CanInsert())
{
bool bStarted = false;
SwRewriter aRewriter;
if(HasSelection())
{
// Only parenthese here, because the regular insert
// is already clipped to the editshell
StartAllAction();
StartUndo(UNDO_INSERT);
OUString aTmpStr1;
aTmpStr1 += SW_RES(STR_START_QUOTE);
aTmpStr1 += GetSelText();
aTmpStr1 += SW_RES(STR_END_QUOTE);
OUString aTmpStr3;
aTmpStr3 += SW_RES(STR_START_QUOTE);
aTmpStr3 += OUString(cChar);
aTmpStr3 += SW_RES(STR_END_QUOTE);
aRewriter.AddRule( UndoArg1, aTmpStr1 );
aRewriter.AddRule( UndoArg2, SW_RES(STR_YIELDS) );
aRewriter.AddRule( UndoArg3, aTmpStr3 );
StartUndo( UNDO_REPLACE, &aRewriter );
bStarted = true;
DelRight();
}
@@ -1602,7 +1617,7 @@ void SwWrtShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar )
if(bStarted)
{
EndAllAction();
EndUndo(UNDO_INSERT);
EndUndo( UNDO_REPLACE, &aRewriter );
}
}
}