[Libreoffice-commits] .: sc/source

Caolán McNamara caolan at kemper.freedesktop.org
Thu Oct 21 13:25:29 PDT 2010


 sc/source/filter/excel/xiescher.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 28ad1e7dcf70f390bd2fa3ff96eff847429aea08
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 21 21:07:51 2010 +0100

    rhbz#636521 Don't record undo info during escher conversion

diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 999927a..c9cc3ab 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3837,6 +3837,10 @@ sal_Size XclImpDrawing::GetProgressSize() const
 
 void XclImpDrawing::ImplConvertObjects( XclImpDffConverter& rDffConv, SdrModel& rSdrModel, SdrPage& rSdrPage )
 {
+    //rhbz#636521, disable undo during conversion. faster, smaller and stops
+    //temp objects being inserted into the undo list
+    bool bOrigUndoStatus = rSdrModel.IsUndoEnabled();
+    rSdrModel.EnableUndo(false);
     // register this drawing manager at the passed (global) DFF manager
     rDffConv.InitializeDrawing( *this, rSdrModel, rSdrPage );
     // process list of objects to be skipped
@@ -3849,6 +3853,7 @@ void XclImpDrawing::ImplConvertObjects( XclImpDffConverter& rDffConv, SdrModel&
     rDffConv.ProcessDrawing( maDffStrm );
     // unregister this drawing manager at the passed (global) DFF manager
     rDffConv.FinalizeDrawing();
+    rSdrModel.EnableUndo(bOrigUndoStatus);
 }
 
 // protected ------------------------------------------------------------------


More information about the Libreoffice-commits mailing list