diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:56:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-10 11:21:00 +0100 |
| commit | 9f40107620316fd04e1fe3669ed7c3a5c2b62eb3 (patch) | |
| tree | b03eab82b776167361590667251deabaee3873e9 /sw/source/filter/html/swhtml.cxx | |
| parent | 12b584e4a9695a7516f239cd33950656212ed0c8 (diff) | |
loplugin:indentation in sw
Change-Id: I4936284bff568b6bb47e5df3821f4ddd78260e92
Reviewed-on: https://gerrit.libreoffice.org/67568
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/html/swhtml.cxx')
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index aa453421f05b..9f3a9d335b11 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -725,23 +725,23 @@ void SwHTMLParser::Continue( HtmlTokenId nToken ) #if OSL_DEBUG_LEVEL > 0 // !!! shouldn't be possible, or ?? -OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound().nNode.GetIndex(), - "Pam.Bound1 is still in the node" ); -OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound( false ).nNode.GetIndex(), - "Pam.Bound2 is still in the node" ); + OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound().nNode.GetIndex(), + "Pam.Bound1 is still in the node" ); + OSL_ENSURE( m_pSttNdIdx->GetIndex()+1 != m_pPam->GetBound( false ).nNode.GetIndex(), + "Pam.Bound2 is still in the node" ); -if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound().nNode.GetIndex() ) -{ - const sal_Int32 nCntPos = m_pPam->GetBound().nContent.GetIndex(); - m_pPam->GetBound().nContent.Assign( pTextNode, - pTextNode->GetText().getLength() + nCntPos ); -} -if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false ).nNode.GetIndex() ) -{ - const sal_Int32 nCntPos = m_pPam->GetBound( false ).nContent.GetIndex(); - m_pPam->GetBound( false ).nContent.Assign( pTextNode, - pTextNode->GetText().getLength() + nCntPos ); -} + if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound().nNode.GetIndex() ) + { + const sal_Int32 nCntPos = m_pPam->GetBound().nContent.GetIndex(); + m_pPam->GetBound().nContent.Assign( pTextNode, + pTextNode->GetText().getLength() + nCntPos ); + } + if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false ).nNode.GetIndex() ) + { + const sal_Int32 nCntPos = m_pPam->GetBound( false ).nContent.GetIndex(); + m_pPam->GetBound( false ).nContent.Assign( pTextNode, + pTextNode->GetText().getLength() + nCntPos ); + } #endif // Keep character attribute! SwTextNode* pDelNd = aNxtIdx.GetNode().GetTextNode(); @@ -2215,7 +2215,7 @@ bool SwHTMLParser::AppendTextNode( SwHTMLAppendMode eMode, bool bUpdateNum ) bool bScript = false; sal_uInt16 nScriptItem; bool bInsert = true; - lcl_swhtml_getItemInfo( *pAttr, bScript, + lcl_swhtml_getItemInfo( *pAttr, bScript, nScriptItem ); // set previous part if( bScript ) @@ -4730,9 +4730,7 @@ void SwHTMLParser::SetTextCollAttrs( HTMLAttrContext *pContext ) // if applicable correct the paragraph indent const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace(); - bool bSetLRSpace; - - bSetLRSpace = nLeftMargin != rLRItem.GetTextLeft() || + bool bSetLRSpace = nLeftMargin != rLRItem.GetTextLeft() || nFirstLineIndent != rLRItem.GetTextFirstLineOfst() || nRightMargin != rLRItem.GetRight(); |