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 | 488974a1293062b17d802dfcdd950f94fc7c6d55 (patch) | |
| tree | 2ba2c96ef5157822201c454b4544f5314b89d056 /sw | |
| parent | 476c2c340d0ee8bfea3d59ea869975107fe05891 (diff) | |
Resolves: fdo#36631 don't crash on undo of ole2 insert
Diffstat (limited to 'sw')
| -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 bf78c617e880..4d6690888aff 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 { |