svx/source/svdraw/textchainflow.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
New commits: commit 7902ac456f8648e4fd9520626d8f4dd46f611f0b Author: matteocam <matteo.campane...@gmail.com> Date: Tue Aug 18 14:30:48 2015 +0200 Set UpdateMode=True before constructing OF/UF Chainers Change-Id: I26980d644942953952ae5c16fa4e230cb077470c diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx index 06275e15..872b4dc 100644 --- a/svx/source/svdraw/textchainflow.cxx +++ b/svx/source/svdraw/textchainflow.cxx @@ -87,10 +87,6 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner *p bOverflow = bIsPageOverflow && mpNextLink; bUnderflow = !bIsPageOverflow && mpNextLink && mpNextLink->HasText(); - // Reset update mode - pFlowOutl->SetUpdateMode(bOldUpdateMode); - - // Get old state on whether to merge para-s or not // NOTE: We handle UF/OF using the _old_ state. The new one is simply saved bool bMustMergeParaAmongLinks = GetTextChain()->GetIsPartOfLastParaInNextLink(mpTargetLink); @@ -108,6 +104,9 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner *p new UFlowChainedText(pFlowOutl, bMustMergeParaAmongLinks) : NULL; + // Reset update mode // Reset it here because we use WriteRTF (needing updatemode = true) in the two constructors above + pFlowOutl->SetUpdateMode(bOldUpdateMode); + // NOTE: Must be called after mp*ChText abd b*flow have been set but before mbOFisUFinduced is reset impUpdateCursorInfo(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits