diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 12:52:01 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 12:52:01 +0000 |
commit | 526054e6ec98e85e7173d951551203a7dffaf8cf (patch) | |
tree | 3d6b35b5c12fd6983a8800440cba87934dd3a59d /sw/source/ui/shells/textsh.cxx | |
parent | f8ff54188d7a8f56c8352de65118e193ffca5328 (diff) |
INTEGRATION: CWS swqbugfixes08 (1.38.2); FILE MERGED
2004/10/11 10:35:52 fme 1.38.2.2: RESYNC: (1.38-1.39); FILE MERGED
2004/09/22 10:20:59 hbrinkm 1.38.2.1: #i34464# creation of rewriter in wrong place replaced
Diffstat (limited to 'sw/source/ui/shells/textsh.cxx')
-rw-r--r-- | sw/source/ui/shells/textsh.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index eb065de377e7..e610fff5ee16 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textsh.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: kz $ $Date: 2004-10-04 19:31:15 $ + * last change: $Author: hr $ $Date: 2004-11-09 13:52:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -788,14 +788,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) const SwRect &rPr = GetShell().GetAnyCurRect(RECT_PAGE_PRT); SwFmtFrmSize aPrtSize(ATT_VAR_SIZE, rPr.Width(), rPr.Height()); - { - SwRewriter aRewriter; - aRewriter.AddRule(UNDO_ARG1, SW_RES(STR_START_QUOTE)); - aRewriter.AddRule(UNDO_ARG2, rSh.GetTableFmt()->GetName()); - aRewriter.AddRule(UNDO_ARG3, SW_RES(STR_END_QUOTE)); - aPrtSize.SetWhich(GetPool().GetWhich(FN_GET_PRINT_AREA)); - } aSet.Put(aPrtSize); aSet.Put(aMgr.GetAttrSet()); @@ -843,7 +836,14 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) } GetView().AutoCaption(FRAME_CAP); - GetShell().EndUndo(UNDO_INSERT); + + { + SwRewriter aRewriter; + + aRewriter.AddRule(UNDO_ARG1, SW_RES(STR_FRAME)); + + GetShell().EndUndo(UNDO_INSERT, &aRewriter); + } GetShell().EndAllAction(); } |