Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8298ED42F for ; Tue, 25 Sep 2012 01:29:16 +0000 (UTC) Received: (qmail 82409 invoked by uid 500); 25 Sep 2012 01:29:16 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 82354 invoked by uid 500); 25 Sep 2012 01:29:16 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 82346 invoked by uid 99); 25 Sep 2012 01:29:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Sep 2012 01:29:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Sep 2012 01:29:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 52ED0238890B; Tue, 25 Sep 2012 01:28:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1389676 - /incubator/ooo/trunk/main/sc/source/ui/docshell/docsh.cxx Date: Tue, 25 Sep 2012 01:28:30 -0000 To: ooo-commits@incubator.apache.org From: leidb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120925012830.52ED0238890B@eris.apache.org> Author: leidb Date: Tue Sep 25 01:28:29 2012 New Revision: 1389676 URL: http://svn.apache.org/viewvc?rev=1389676&view=rev Log: #121001# fix issue which loading the xls file contain drawing, form control, graphic ... will enable the undo action Reported by: Yan Ji Patch by: Lei De Bin Review by: Li Jian Yuan Modified: incubator/ooo/trunk/main/sc/source/ui/docshell/docsh.cxx Modified: incubator/ooo/trunk/main/sc/source/ui/docshell/docsh.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/docshell/docsh.cxx?rev=1389676&r1=1389675&r2=1389676&view=diff ============================================================================== --- incubator/ooo/trunk/main/sc/source/ui/docshell/docsh.cxx (original) +++ incubator/ooo/trunk/main/sc/source/ui/docshell/docsh.cxx Tue Sep 25 01:28:29 2012 @@ -1412,6 +1412,7 @@ sal_Bool __EXPORT ScDocShell::ConvertFro } FinishedLoading( SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES ); + GetUndoManager()->Clear(); // #73762# invalidate eventually temporary table areas if ( bRet ) aDocument.InvalidateTableArea();