[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source

[Jan Holesovsky]

 sw/source/core/doc/doclay.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2ecdbd900bfceef0aa8419b71cfbb3622cc00d32
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 27 14:49:41 2011 +0100

    Resolves: fdo#36631 don't crash on undo of ole2 insert
    
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index a90b3a7..0a734fb 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -474,7 +474,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
     {
@@ -2363,4 +2368,4 @@ std::set<SwRootFrm*> SwDoc::GetAllLayouts()
     return aAllLayouts;
 }//swmod 070825
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */