diff options
Diffstat (limited to 'lotuswordpro/source/filter/lwpfribtable.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpfribtable.cxx | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/lotuswordpro/source/filter/lwpfribtable.cxx b/lotuswordpro/source/filter/lwpfribtable.cxx index a6c50b86f9ee..d94f2f845859 100644 --- a/lotuswordpro/source/filter/lwpfribtable.cxx +++ b/lotuswordpro/source/filter/lwpfribtable.cxx @@ -81,7 +81,7 @@ void LwpFribTable::RegisterNewStyle() if (pSuper) pSuper->RegisterNewStyle(); XFParaStyle* pOldStyle = m_pPara->GetXFParaStyle(); - if(HasNextFrib()) + if (HasNextFrib()) { if (pOldStyle->GetMasterPage().isEmpty()) m_StyleName = pOldStyle->GetStyleName(); @@ -105,21 +105,20 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont) rtl::Reference<LwpVirtualLayout> xContainer(pSuper->GetContainerLayout()); if (!xContainer.is()) return; - if ( LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == nType - && !xContainer->IsCell()) + if (LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == nType && !xContainer->IsCell()) { pXFContentContainer = m_pPara->GetXFContainer(); //delete the additional blank para XFParagraph* pCurrPara = m_pPara->GetFribs().GetXFPara(); if (pXFContentContainer && !pCurrPara->HasContents()) { - if(pXFContentContainer->GetLastContent() == pCurrPara) + if (pXFContentContainer->GetLastContent() == pCurrPara) { pXFContentContainer->RemoveLastContent(); } } } - else if( LwpLayoutRelativityGuts::LAY_PARA_RELATIVE == nType) + else if (LwpLayoutRelativityGuts::LAY_PARA_RELATIVE == nType) { //same page as text and in frame if (xContainer->IsFrame()) @@ -129,15 +128,14 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont) else if (xContainer->IsCell()) { //same page as text and in cell, get the first xfpara - rtl::Reference<XFContent> first( - pCont->FindFirstContent(enumXFContentPara)); + rtl::Reference<XFContent> first(pCont->FindFirstContent(enumXFContentPara)); XFContentContainer* pXFFirtPara = static_cast<XFContentContainer*>(first.get()); - if(pXFFirtPara) + if (pXFFirtPara) pXFContentContainer = pXFFirtPara; } } OUString sChangeID; - if(m_bRevisionFlag) + if (m_bRevisionFlag) { LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance(); LwpChangeMgr* pChangeMgr = pGlobal->GetLwpChangeMgr(); @@ -153,7 +151,7 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont) if (pXFContentContainer) pSuper->XFConvert(pXFContentContainer); - if(m_bRevisionFlag) + if (m_bRevisionFlag) { if (!sChangeID.isEmpty() && pXFContentContainer) { @@ -163,15 +161,13 @@ void LwpFribTable::XFConvert(XFContentContainer* pCont) } } - if(LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == nType - && HasNextFrib()) + if (LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == nType && HasNextFrib()) { rtl::Reference<XFParagraph> xXFPara(new XFParagraph); xXFPara->SetStyleName(m_StyleName); m_pPara->AddXFContent(xXFPara.get()); m_pPara->GetFribs().SetXFPara(xXFPara.get()); } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |