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 19D519741 for ; Tue, 26 Jun 2012 15:29:27 +0000 (UTC) Received: (qmail 8239 invoked by uid 500); 26 Jun 2012 15:29:26 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 8208 invoked by uid 500); 26 Jun 2012 15:29:26 -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 8201 invoked by uid 99); 26 Jun 2012 15:29:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Jun 2012 15:29:26 +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, 26 Jun 2012 15:29:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DB8B42388962; Tue, 26 Jun 2012 15:29:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1354063 - /incubator/ooo/trunk/main/sc/source/ui/view/viewdata.cxx Date: Tue, 26 Jun 2012 15:29:05 -0000 To: ooo-commits@incubator.apache.org From: af@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120626152905.DB8B42388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: af Date: Tue Jun 26 15:29:05 2012 New Revision: 1354063 URL: http://svn.apache.org/viewvc?rev=1354063&view=rev Log: #i119557# Ignore redundant "split" property. Patch by: Jianyuan Li Found by: binguo Review by: Andre Fischer Modified: incubator/ooo/trunk/main/sc/source/ui/view/viewdata.cxx Modified: incubator/ooo/trunk/main/sc/source/ui/view/viewdata.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/view/viewdata.cxx?rev=1354063&r1=1354062&r2=1354063&view=diff ============================================================================== --- incubator/ooo/trunk/main/sc/source/ui/view/viewdata.cxx (original) +++ incubator/ooo/trunk/main/sc/source/ui/view/viewdata.cxx Tue Jun 26 15:29:05 2012 @@ -2585,6 +2585,9 @@ void ScViewData::ReadExtOptions( const S double nFactor = pDocShell->GetOutputFactor(); aPixel.X() = (long)( aPixel.X() * nFactor + 0.5 ); } + + bHSplit = bHSplit && aPixel.X() > 0; + bVSplit = bVSplit && aPixel.Y() > 0; if( bHSplit ) { rViewTab.eHSplitMode = SC_SPLIT_NORMAL;