Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A7C9F10DA0 for ; Wed, 20 Nov 2013 13:32:57 +0000 (UTC) Received: (qmail 53393 invoked by uid 500); 20 Nov 2013 13:32:56 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 53348 invoked by uid 500); 20 Nov 2013 13:32:55 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 53334 invoked by uid 99); 20 Nov 2013 13:32:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Nov 2013 13:32:54 +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; Wed, 20 Nov 2013 13:32:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3696323888E2; Wed, 20 Nov 2013 13:32:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1543812 - /openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx Date: Wed, 20 Nov 2013 13:32:31 -0000 To: commits@openoffice.apache.org From: orw@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131120133231.3696323888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: orw Date: Wed Nov 20 13:32:30 2013 New Revision: 1543812 URL: http://svn.apache.org/r1543812 Log: 123578: revert part of changes made for bug 119620 as page styles for only left or only right pages does not make sense for imported Microsoft Word documents as Microsoft Word does not support such a feature. Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx?rev=1543812&r1=1543811&r2=1543812&view=diff ============================================================================== --- openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx (original) +++ openoffice/trunk/main/sw/source/filter/ww8/ww8par.cxx Wed Nov 20 13:32:30 2013 @@ -3882,26 +3882,6 @@ void wwSectionManager::SetUseOn(wwSectio rSection.mpTitlePage->WriteUseOn( (UseOnPage) (eUseBase | nsUseOnPage::PD_HEADERSHARE | nsUseOnPage::PD_FOOTERSHARE)); } - - if( nsUseOnPage::PD_MIRROR != (UseOnPage)(eUse & nsUseOnPage::PD_MIRROR) ) - { - if( rSection.maSep.bkc == 3 ) - { - if( rSection.mpPage ) - rSection.mpPage->SetUseOn( nsUseOnPage::PD_LEFT ); - if( rSection.mpTitlePage ) - rSection.mpTitlePage->SetUseOn( nsUseOnPage::PD_LEFT ); - } - else if( rSection.maSep.bkc == 4 ) - { - if( rSection.mpPage ) - rSection.mpPage->SetUseOn( nsUseOnPage::PD_RIGHT ); - if( rSection.mpTitlePage ) - rSection.mpTitlePage->SetUseOn( nsUseOnPage::PD_RIGHT ); - } - - } - } //Set the page descriptor on this node, handle the different cases for a text @@ -3981,17 +3961,17 @@ SwFmtPageDesc wwSectionManager::SetSwFmt //Set page before hd/ft const wwSection *pPrevious = 0; - mySegIter aPrev = rIter; - while( aPrev!= rStart ) - { - aPrev--; - pPrevious = &(*(aPrev)); - if( aPrev->IsContinous()) - continue; - else{ - break; - } - } + mySegIter aPrev = rIter; + while( aPrev!= rStart ) + { + aPrev--; + pPrevious = &(*(aPrev)); + if( aPrev->IsContinous()) + continue; + else{ + break; + } + } SetHdFt(*rIter, std::distance(rStart, rIter), pPrevious); SetUseOn(*rIter);