[Libreoffice-commits] core.git: svx/source

[Stephan Bergmann]

 svx/source/svdraw/textchainflow.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 9ed5793a8b602f992ad0f52b919e066d25eda49e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 29 15:40:35 2016 +0200

    clang-analyzer-deadcode.DeadStores
    
    cf. <https://lists.freedesktop.org/archives/libreoffice/2016-June/074681.html>
    "Re: chained editeng: Add TextChainFlow related files"
    
    Change-Id: I0b1611db620c0e0ee56890e652066afb95b3e9ce

diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index 1b124fb..145fae7 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -95,9 +95,6 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner *p
     // If we had an underflow before we have to deep merge paras anyway
     bool bMustMergeParaOF = bMustMergeParaAmongLinks || mbOFisUFinduced;
 
-    // XXX
-    bMustMergeParaOF = true; // XXX: Experiment: no deep merging.
-
     mpOverflChText = bOverflow ?
                      new OFlowChainedText(pFlowOutl, bMustMergeParaOF) :
                      nullptr;