summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatteocam <matteo.campanelli@gmail.com>2015-08-20 19:49:58 +0200
committermatteocam <matteo.campanelli@gmail.com>2015-08-20 19:49:58 +0200
commitfdecbb0fb1d7bf8faa0edf0c41396f338ad7dba4 (patch)
treeeea4565379184c066ca0a7b97f665654d467bec5
parent9ac8f484b624fc94ab861f750bb8be6225e000cf (diff)
Experiment: disable deep merging
Change-Id: I645883f9c93698350c320fcfd64476913c971f80
-rw-r--r--svx/source/svdraw/textchainflow.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index 0c107b326a7b..922cfb3756af 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -95,6 +95,10 @@ 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) :
NULL;