diff options
Diffstat (limited to 'lotuswordpro/source/filter/lwpfribsection.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpfribsection.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx index 3cd68fca4647..a3ada1578e01 100644 --- a/lotuswordpro/source/filter/lwpfribsection.cxx +++ b/lotuswordpro/source/filter/lwpfribsection.cxx @@ -304,27 +304,27 @@ void LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); m_StyleName = pXFStyleManager->AddStyle(std::move(xOverStyle)).m_pStyle->GetStyleName(); //register section style here - if(m_bNewSection) + if(!m_bNewSection) + return; + + std::unique_ptr<XFSectionStyle> pSectStyle(new XFSectionStyle()); + //set margin + pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get()); + LwpPageLayout* pCurrentLayout = pStory ? pStory->GetCurrentLayout() : nullptr; + if (pCurrentLayout) { - std::unique_ptr<XFSectionStyle> pSectStyle(new XFSectionStyle()); - //set margin - pStory = dynamic_cast<LwpStory*>(m_pPara->GetStoryID().obj().get()); - LwpPageLayout* pCurrentLayout = pStory ? pStory->GetCurrentLayout() : nullptr; - if (pCurrentLayout) - { - double fLeft = m_pLayout->GetMarginsValue(MARGIN_LEFT) - pCurrentLayout->GetMarginsValue(MARGIN_LEFT); - double fRight = m_pLayout->GetMarginsValue(MARGIN_RIGHT) - pCurrentLayout->GetMarginsValue(MARGIN_RIGHT); - pSectStyle->SetMarginLeft(fLeft); - pSectStyle->SetMarginRight(fRight); - } + double fLeft = m_pLayout->GetMarginsValue(MARGIN_LEFT) - pCurrentLayout->GetMarginsValue(MARGIN_LEFT); + double fRight = m_pLayout->GetMarginsValue(MARGIN_RIGHT) - pCurrentLayout->GetMarginsValue(MARGIN_RIGHT); + pSectStyle->SetMarginLeft(fLeft); + pSectStyle->SetMarginRight(fRight); + } - XFColumns* pColumns = m_pLayout->GetXFColumns(); - if(pColumns) - { - pSectStyle->SetColumns(pColumns); - } - m_SectionStyleName = pXFStyleManager->AddStyle(std::move(pSectStyle)).m_pStyle->GetStyleName(); + XFColumns* pColumns = m_pLayout->GetXFColumns(); + if(pColumns) + { + pSectStyle->SetColumns(pColumns); } + m_SectionStyleName = pXFStyleManager->AddStyle(std::move(pSectStyle)).m_pStyle->GetStyleName(); } /** |