commit 5110cca39cc55c8977b81f7b09873e626144b29b
author Jim Raykowski <raykowj@gmail.com> Mon Nov 16 08:09:11 2020 -0900
committer Jim Raykowski <raykowj@gmail.com> Tue Nov 17 19:30:49 2020 +0100
tree ce77132533c887f648abd0c114175082f5f0169e
parent fed6c4c70da6b35d72b670c8f4d8e866cdac21e4

tdf#130629 Don't add object insert undo twice

Change-Id: I074afd4397b6fc4631bd00655de56b8a154d7dff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105955
Tested-by: Jenkins
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

sw/source/core/frmedt/feshview.cxx

diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index ee81434..767e4e7 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -3137,7 +3137,12 @@ void SwFEShell::CreateDefaultShape( SdrObjKind eSdrObjectKind, const tools::Rect
        }
        SdrPageView* pPageView = pDrawView->GetSdrPageView();
        SdrCreateView::SetupObjLayer(pPageView, pDrawView->GetActiveLayer(), pObj);
        // switch undo off or this combined with ImpEndCreate will cause two undos
        // see comment made in SwFEShell::EndCreate (we create our own undo-object!)
        const bool bUndo(GetDoc()->GetIDocumentUndoRedo().DoesUndo());
        GetDoc()->GetIDocumentUndoRedo().DoUndo(false);
        pDrawView->InsertObjectAtView(pObj, *pPageView);
        GetDoc()->GetIDocumentUndoRedo().DoUndo(bUndo);
    }
    ImpEndCreate();
}