Kaydet (Commit) c1743d46 authored tarafından Michael Stahl's avatar Michael Stahl

sw_redlinehide: trivial conversions in porfld.cxx

Change-Id: Ic124bc328482f4c28a92cb0a83bd1f5c5cd9d3a2
üst d2f78217
...@@ -366,13 +366,13 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf ) ...@@ -366,13 +366,13 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf )
{ {
// aExpand has not yet been shortened; the new Ofst is a // aExpand has not yet been shortened; the new Ofst is a
// result of nRest // result of nRest
sal_Int32 nNextOfst = m_aExpand.getLength() - nRest; TextFrameIndex nNextOfst = TextFrameIndex(m_aExpand.getLength()) - nRest;
if ( IsQuoVadisPortion() ) if ( IsQuoVadisPortion() )
nNextOfst = nNextOfst + static_cast<SwQuoVadisPortion*>(this)->GetContText().getLength(); nNextOfst = nNextOfst + TextFrameIndex(static_cast<SwQuoVadisPortion*>(this)->GetContText().getLength());
OUString aNew( m_aExpand.copy( nNextOfst ) ); OUString aNew( m_aExpand.copy(sal_Int32(nNextOfst)) );
m_aExpand = m_aExpand.copy( 0, nNextOfst ); m_aExpand = m_aExpand.copy(0, sal_Int32(nNextOfst));
// These characters should not be contained in the follow // These characters should not be contained in the follow
// field portion. They are handled via the HookChar mechanism. // field portion. They are handled via the HookChar mechanism.
...@@ -551,12 +551,12 @@ bool SwNumberPortion::Format( SwTextFormatInfo &rInf ) ...@@ -551,12 +551,12 @@ bool SwNumberPortion::Format( SwTextFormatInfo &rInf )
if ( !mbLabelAlignmentPosAndSpaceModeActive ) if ( !mbLabelAlignmentPosAndSpaceModeActive )
{ {
if ( !rInf.GetTextFrame()->GetTextNode()->getIDocumentSettingAccess()->get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING) && if (!rInf.GetTextFrame()->GetDoc().getIDocumentSettingAccess().get(DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING) &&
// #i32902# // #i32902#
!IsFootnoteNumPortion() ) !IsFootnoteNumPortion() )
{ {
nDiff = rInf.Left() nDiff = rInf.Left()
+ rInf.GetTextFrame()->GetTextNode()-> + rInf.GetTextFrame()->GetTextNodeForParaProps()->
GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst() GetSwAttrSet().GetLRSpace().GetTextFirstLineOfst()
- rInf.First() - rInf.First()
+ rInf.ForcedLeftMargin(); + rInf.ForcedLeftMargin();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment