Kaydet (Commit) ac89eb07 authored tarafından Serge Krot's avatar Serge Krot Kaydeden (comit) Thorsten Behrens

sw: docx: avoid GrabBag checks without m_bStartedParaSdt flag

Change-Id: If5c903030c624cbe2552cebfb011f912648929bf
Reviewed-on: https://gerrit.libreoffice.org/64867
Tested-by: Jenkins
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 2b14ac71
...@@ -367,6 +367,8 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText ...@@ -367,6 +367,8 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText
// would normally arrive, it would be too late (would be after the // would normally arrive, it would be too late (would be after the
// paragraph start has been written). // paragraph start has been written).
bool bEndParaSdt = false; bool bEndParaSdt = false;
if (m_bStartedParaSdt)
{
SwTextNode* pTextNode = m_rExport.m_pCurPam->GetNode().GetTextNode(); SwTextNode* pTextNode = m_rExport.m_pCurPam->GetNode().GetTextNode();
if (pTextNode && pTextNode->GetpSwAttrSet()) if (pTextNode && pTextNode->GetpSwAttrSet())
{ {
...@@ -378,6 +380,7 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText ...@@ -378,6 +380,7 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText
bEndParaSdt = m_bStartedParaSdt && rMap.find("ParaSdtEndBefore") != rMap.end(); bEndParaSdt = m_bStartedParaSdt && rMap.find("ParaSdtEndBefore") != rMap.end();
} }
} }
}
// TODO also avoid multiline paragraphs in those SDT types for shape text // TODO also avoid multiline paragraphs in those SDT types for shape text
bool bOneliner = m_bStartedParaSdt && !m_rExport.SdrExporter().IsDMLAndVMLDrawingOpen() && lcl_isOnelinerSdt(m_aStartedParagraphSdtPrAlias); bool bOneliner = m_bStartedParaSdt && !m_rExport.SdrExporter().IsDMLAndVMLDrawingOpen() && lcl_isOnelinerSdt(m_aStartedParagraphSdtPrAlias);
if (bEndParaSdt || (m_bStartedParaSdt && m_bHadSectPr) || bOneliner) if (bEndParaSdt || (m_bStartedParaSdt && m_bHadSectPr) || bOneliner)
......
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