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 3E7E8DF7D for ; Fri, 14 Sep 2012 14:57:06 +0000 (UTC) Received: (qmail 40792 invoked by uid 500); 14 Sep 2012 14:57:06 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 40728 invoked by uid 500); 14 Sep 2012 14:57:06 -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 40721 invoked by uid 99); 14 Sep 2012 14:57:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2012 14:57:06 +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; Fri, 14 Sep 2012 14:57:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 19EE923888FE; Fri, 14 Sep 2012 14:56:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1384807 - /incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par5.cxx Date: Fri, 14 Sep 2012 14:56:20 -0000 To: ooo-commits@incubator.apache.org From: orw@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120914145620.19EE923888FE@eris.apache.org> Author: orw Date: Fri Sep 14 14:56:19 2012 New Revision: 1384807 URL: http://svn.apache.org/viewvc?rev=1384807&view=rev Log: #120877# - method - correct adjustment of page/section segment insertion data in order to assure that the page/section starts at the correct node. Modified: incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par5.cxx Modified: incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par5.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par5.cxx?rev=1384807&r1=1384806&r2=1384807&view=diff ============================================================================== --- incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par5.cxx (original) +++ incubator/ooo/branches/writer001/main/sw/source/filter/ww8/ww8par5.cxx Fri Sep 14 14:56:19 2012 @@ -3474,9 +3474,6 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8 rDoc.InsertTableOf(*pPaM->GetPoint(), *aFltTOX.GetBase()); - - //inserting a toc inserts a section before this point, so adjust pos - //for future page/section segment insertion //The TOC field representation contents should be inserted into TOC section, but not after TOC section. //So we need update the document position when loading TOC representation and after loading TOC; if (mpPosAfterTOC) @@ -3491,7 +3488,8 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8 if (SwTOXBase* pBase2 = (SwTOXBase*)rDoc.GetCurTOX(*aRegion.GetPoint())) { pBase2->SetMSTOCExpression(rStr); - if(nIndexCols>1) + + if ( nIndexCols > 1 ) { // Set the column number for index SfxItemSet aSet( rDoc.GetAttrPool(), RES_COL, RES_COL ); @@ -3501,8 +3499,9 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8 pBase2->SetAttrSet( aSet ); } - maSectionManager.PrependedInlineNode(*pPaM->GetPoint(), - *aRegion.GetNode()); + // inserting a toc inserts a section before this point, so adjust pos + // for future page/section segment insertion + maSectionManager.PrependedInlineNode( *mpPosAfterTOC->GetPoint(), *aRegion.GetNode() ); } // Setze Ende in Stack