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 8A3E6DBF3 for ; Wed, 22 Aug 2012 05:35:53 +0000 (UTC) Received: (qmail 78293 invoked by uid 500); 22 Aug 2012 05:35:53 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 78190 invoked by uid 500); 22 Aug 2012 05:35:52 -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 78168 invoked by uid 99); 22 Aug 2012 05:35:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Aug 2012 05:35:52 +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, 22 Aug 2012 05:35:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 099B52388962; Wed, 22 Aug 2012 05:35:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1375902 - /incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx Date: Wed, 22 Aug 2012 05:35:05 -0000 To: ooo-commits@incubator.apache.org From: chengjh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120822053506.099B52388962@eris.apache.org> Author: chengjh Date: Wed Aug 22 05:35:05 2012 New Revision: 1375902 URL: http://svn.apache.org/viewvc?rev=1375902&view=rev Log: Fix issue #i119650: Font size increased if saved by AOO * sw/source/filter/ww8/ww8atr.cxx MS Word Binary compatibility Patch by: Chen Peng, Found by: Yan Ji, Review by: Jian Hong Cheng, Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx?rev=1375902&r1=1375901&r2=1375902&view=diff ============================================================================== --- incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx (original) +++ incubator/ooo/trunk/main/sw/source/filter/ww8/ww8atr.cxx Wed Aug 22 05:35:05 2012 @@ -980,6 +980,9 @@ void WW8AttributeOutput::EndParagraph( w m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); m_rWW8Export.pO->Remove( 0, m_rWW8Export.pO->Count() ); // delete + //For Bug 119650, should break the properties of CHP PLC after a paragraph end. + m_rWW8Export.pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), + m_rWW8Export.pO->GetData() ); } } }