diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-27 14:49:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-27 14:49:41 +0100 |
| commit | c234df7779b0e43e4433e71933c22f9e703da735 (patch) | |
| tree | d15e4d00faf4d24679eca43bebd58243cafe34a5 | |
| parent | 254c08bf5096e341a395ed55945fc1009b78e878 (diff) | |
Resolves: fdo#36631 don't crash on undo of ole2 insert
| -rw-r--r-- | sw/source/core/doc/doclay.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 66a7af4b0c..c4d348aa0b 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -473,7 +473,12 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource, // sorge dafuer das auch Fly's in Fly's kopiert werden aIdx = *pSttNd->EndOfSectionNode(); + bool bDrawingLayerUndoState = GetIDocumentUndoRedo().DoesDrawUndo(); + //fdo#36631 disable any undo operations associated with the contact + //object itself. They should be managed by SwUndoInsLayFmt. + GetIDocumentUndoRedo().DoDrawUndo(false); pSrcDoc->CopyWithFlyInFly( aRg, 0, aIdx, sal_False, sal_True, sal_True ); + GetIDocumentUndoRedo().DoDrawUndo(bDrawingLayerUndoState); } else { |