incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1360123 - /incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx
Date Wed, 11 Jul 2012 11:10:23 GMT
Author: orw
Date: Wed Jul 11 11:10:22 2012
New Revision: 1360123

URL: http://svn.apache.org/viewvc?rev=1360123&view=rev
Log:
#119686# - method <XclImpDrawObjBase::PreProcessSdrObject(..)> - disable Undo for setting
the object name

           Found by: Li Lin Yi
           Patch by: Zhang Lu
           Review by: Oliver-Rainer Wittmann (orw at apache dot org)

Modified:
    incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx

Modified: incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx?rev=1360123&r1=1360122&r2=1360123&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx Wed Jul 11 11:10:22 2012
@@ -447,10 +447,11 @@ void XclImpDrawObjBase::PreProcessSdrObj
 {
     // default: front layer, derived classes may have to set other layer in DoPreProcessSdrObj()
     rSdrObj.NbcSetLayer( SC_LAYER_FRONT );
-
+    const bool bEnableUndo = rSdrObj.GetModel()->IsUndoEnabled();
+    rSdrObj.GetModel()->EnableUndo(false);
     // set object name (GetObjName() will always return a non-empty name)
     rSdrObj.SetName( GetObjName() );
-
+    rSdrObj.GetModel()->EnableUndo(bEnableUndo);
     // #i39167# full width for all objects regardless of horizontal alignment
     rSdrObj.SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) );
 



Mime
View raw message