diff options
-rw-r--r-- | sw/source/core/text/inftxt.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/text/portxt.cxx | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 3594f3d84f65..11f3a2198364 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -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; } diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 487ebf307157..f881fe368dc5 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -747,6 +747,12 @@ sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo &rInf ) } 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( SwTxtFormatInfo &rInf ) // adjust portion length accordingly SetLen( GetLen() + 1 ); } + else + { + rInf.SetLineStart( nFormerLineStart ); + } } } |