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 533FA109F8 for ; Mon, 20 Jan 2014 10:57:45 +0000 (UTC) Received: (qmail 63932 invoked by uid 500); 20 Jan 2014 10:57:44 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 63889 invoked by uid 500); 20 Jan 2014 10:57:40 -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 63878 invoked by uid 99); 20 Jan 2014 10:57:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jan 2014 10:57:37 +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; Mon, 20 Jan 2014 10:57:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 472972388868; Mon, 20 Jan 2014 10:57:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1559666 - in /openoffice/trunk/main/sw/source/core/text: inftxt.hxx portxt.cxx Date: Mon, 20 Jan 2014 10:57:13 -0000 To: commits@openoffice.apache.org From: orw@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140120105713.472972388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: orw Date: Mon Jan 20 10:57:12 2014 New Revision: 1559666 URL: http://svn.apache.org/r1559666 Log: 124039: - assure correct line break for multi-lined Input Fields Modified: openoffice/trunk/main/sw/source/core/text/inftxt.hxx openoffice/trunk/main/sw/source/core/text/portxt.cxx Modified: openoffice/trunk/main/sw/source/core/text/inftxt.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/inftxt.hxx?rev=1559666&r1=1559665&r2=1559666&view=diff ============================================================================== --- openoffice/trunk/main/sw/source/core/text/inftxt.hxx (original) +++ openoffice/trunk/main/sw/source/core/text/inftxt.hxx Mon Jan 20 10:57:12 2014 @@ -608,7 +608,6 @@ public: inline void Right( const SwTwips nNew ) { nRight = nNew; } inline SwTwips First() const { return nFirst; } inline void First( const SwTwips nNew ) { nFirst = nNew; } - inline SwTwips CurrLeft() const { return (nLineStart ? nLeft : nFirst); } inline KSHORT RealWidth() const { return nRealWidth; } inline void RealWidth( const KSHORT nNew ) { nRealWidth = nNew; } inline KSHORT ForcedLeftMargin() const { return nForcedLeftMargin; } Modified: openoffice/trunk/main/sw/source/core/text/portxt.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/portxt.cxx?rev=1559666&r1=1559665&r2=1559666&view=diff ============================================================================== --- openoffice/trunk/main/sw/source/core/text/portxt.cxx (original) +++ openoffice/trunk/main/sw/source/core/text/portxt.cxx Mon Jan 20 10:57:12 2014 @@ -747,6 +747,12 @@ sal_Bool SwTxtInputFldPortion::Format( S } else { + const xub_StrLen nFormerLineStart = rInf.GetLineStart(); + if ( !mbContainsInputFieldStart ) + { + rInf.SetLineStart( 0 ); + } + bRet = SwTxtPortion::Format( rInf ); if ( mbContainsInputFieldEnd ) @@ -763,6 +769,10 @@ sal_Bool SwTxtInputFldPortion::Format( S // adjust portion length accordingly SetLen( GetLen() + 1 ); } + else + { + rInf.SetLineStart( nFormerLineStart ); + } } }