Kaydet (Commit) 1fdd61db authored tarafından Miklos Vajna's avatar Miklos Vajna

n#693238 dmapper: fix margin values vs SBkc = 0 at the end of the doc

The problem was that a continous section break at the end of the
document caused the section margins to be ignored. Just ignoring the
continous section break (only in case it's at the end of the document)
makes the problem go away.

The original fix was commit cd1c434c,
but it got reverted in commit 2dee7d62,
as it caused fdo#44292. This second attempt fixes the original bug
again, without introducing the "4 columns" bug.

Change-Id: I75d612430a5cd631dec0d224127cba580070900d
üst b709845e
...@@ -2369,7 +2369,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType ...@@ -2369,7 +2369,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
*/ */
OSL_ENSURE(pSectionContext, "SectionContext unavailable!"); OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
if(pSectionContext) if(pSectionContext)
pSectionContext->SetBreakType( nIntValue ); {
// Ignore continous section break at the end of the document
// It makes the importer loose margin settings with no benefit
if (m_pImpl->GetParaSectpr() || nIntValue != 0)
pSectionContext->SetBreakType( nIntValue );
}
break; break;
case 143: case 143:
case NS_sprm::LN_SFTitlePage: // sprmSFTitlePage case NS_sprm::LN_SFTitlePage: // sprmSFTitlePage
......
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