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 B69F0DD56 for ; Thu, 6 Sep 2012 11:39:10 +0000 (UTC) Received: (qmail 61179 invoked by uid 500); 6 Sep 2012 11:39:10 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 60946 invoked by uid 500); 6 Sep 2012 11:39:09 -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 60392 invoked by uid 99); 6 Sep 2012 11:39:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2012 11:39:09 +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; Thu, 06 Sep 2012 11:39:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6B66C238899C; Thu, 6 Sep 2012 11:38:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1381562 - /incubator/ooo/trunk/main/editeng/source/outliner/outliner.cxx Date: Thu, 06 Sep 2012 11:38:23 -0000 To: ooo-commits@incubator.apache.org From: alg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120906113823.6B66C238899C@eris.apache.org> Author: alg Date: Thu Sep 6 11:38:22 2012 New Revision: 1381562 URL: http://svn.apache.org/viewvc?rev=1381562&view=rev Log: Do not enable outliner when it was not before only for temporary undo disable Modified: incubator/ooo/trunk/main/editeng/source/outliner/outliner.cxx Modified: incubator/ooo/trunk/main/editeng/source/outliner/outliner.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/editeng/source/outliner/outliner.cxx?rev=1381562&r1=1381561&r2=1381562&view=diff ============================================================================== --- incubator/ooo/trunk/main/editeng/source/outliner/outliner.cxx (original) +++ incubator/ooo/trunk/main/editeng/source/outliner/outliner.cxx Thu Sep 6 11:38:22 2012 @@ -256,10 +256,11 @@ void Outliner::Init( sal_uInt16 nMode ) pEditEngine->SetControlWord( nCtrl ); + const bool bWasUndoEnabled(IsUndoEnabled()); EnableUndo(false); ImplInitDepth( 0, GetMinDepth(), sal_False ); GetUndoManager().Clear(); - EnableUndo(true); + EnableUndo(bWasUndoEnabled); } void Outliner::SetMaxDepth( sal_Int16 nDepth, sal_Bool bCheckParagraphs )