Attachment 164012 Details for Bug 121659 – tdf121659_patch.diff: good enough for this specific example kind of fix

[patch] tdf121659_patch.diff: good enough for this specific example kind of fix

tdf121659_patch.diff (text/plain), 1.63 KB, created by Justin L on 2020-08-06 18:53:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Justin L

Created: 2020-08-06 18:53:35 UTC

Size: 1.63 KB

patch

obsolete

>diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
>index adb2f8359662..58b3d843a44b 100644
>--- a/writerfilter/source/dmapper/DomainMapper.cxx
>+++ b/writerfilter/source/dmapper/DomainMapper.cxx
>@@ -3034,18 +3034,20 @@ void DomainMapper::lcl_startParagraphGroup()
>             const OUString& sDefaultParaStyle = m_pImpl->GetDefaultParaStyleName();
>             m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, uno::makeAny( sDefaultParaStyle ) );
>             m_pImpl->SetCurrentParaStyleName( sDefaultParaStyle );
>+
>+            if (m_pImpl->isBreakDeferred(PAGE_BREAK))
>+                m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE));
>+            else if (m_pImpl->isBreakDeferred(COLUMN_BREAK))
>+                m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE));
>         }
>-        if (m_pImpl->isBreakDeferred(PAGE_BREAK))
>-            m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_PAGE_BEFORE));
>-        else if (m_pImpl->isBreakDeferred(COLUMN_BREAK))
>-            m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::makeAny(style::BreakType_COLUMN_BEFORE));
> 
>         if (m_pImpl->isParaSdtEndDeferred())
>             m_pImpl->GetTopContext()->Insert(PROP_PARA_SDT_END_BEFORE, uno::makeAny(true), true, PARA_GRAB_BAG);
>     }
>     m_pImpl->SetIsFirstRun(true);
>     m_pImpl->SetIsOutsideAParagraph(false);
>-    m_pImpl->clearDeferredBreaks();
>+    if ( !m_pImpl->IsInShape() )
>+        m_pImpl->clearDeferredBreaks();
>     m_pImpl->setParaSdtEndDeferred(false);
> }
>

Actions: View

Attachments on bug 121659: 146944 | 146945 | 146946 | 147740 | 163804 | 163806 | 163807 | 164012