[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 4 commits - svx/source

[matteocam]

 svx/source/svdraw/textchainflow.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f73c004358ca3eada9ae57f44fdb1cf85d78fa47
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Aug 20 19:54:12 2015 +0200

    Experiment: always enable deep merging
    
    Change-Id: I6c31ea55a6747aaef28d7ab32883287f6f551c31

diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index c238331..922cfb3 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -97,7 +97,7 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner *p
     bool bMustMergeParaOF = bMustMergeParaAmongLinks || mbOFisUFinduced;
 
     // XXX
-    bMustMergeParaOF = false; // XXX: Experiment: no deep merging.
+    bMustMergeParaOF = true; // XXX: Experiment: no deep merging.
 
     mpOverflChText = bOverflow ?
                      new OFlowChainedText(pFlowOutl, bMustMergeParaOF) :
commit 3a56881bbd9c0338600d4606f1632ad06dfa7c35
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Aug 20 19:51:03 2015 +0200

    Experiment: disable deep merging
    
    Change-Id: Ibcfd63433b750d7c0bec92ce7be3797ff11264d6

diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index 922cfb3..c238331 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -97,7 +97,7 @@ void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner *p
     bool bMustMergeParaOF = bMustMergeParaAmongLinks || mbOFisUFinduced;
 
     // XXX
-    bMustMergeParaOF = true; // XXX: Experiment: no deep merging.
+    bMustMergeParaOF = false; // XXX: Experiment: no deep merging.
 
     mpOverflChText = bOverflow ?
                      new OFlowChainedText(pFlowOutl, bMustMergeParaOF) :
commit fdecbb0fb1d7bf8faa0edf0c41396f338ad7dba4
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Aug 20 19:49:58 2015 +0200

    Experiment: disable deep merging
    
    Change-Id: I645883f9c93698350c320fcfd64476913c971f80

diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index 0c107b3..922cfb3 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;
commit 9ac8f484b624fc94ab861f750bb8be6225e000cf
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Aug 20 18:49:04 2015 +0200

    Don't reset MaxAutoPaperSize in ExecuteUnderflow
    
    Change-Id: Ib570029d6e43a57dc583b2e8992f5abe4c5d97d5

diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index cad0b3c..0c107b3 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -173,7 +173,7 @@ void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
         mpTargetLink->NbcSetOutlinerParaObject(pNewText);
 
     // Restore size and set new text
-    pOutl->SetMaxAutoPaperSize(aOldSize);
+    //pOutl->SetMaxAutoPaperSize(aOldSize); // XXX
     pOutl->SetText(*pNewText);
 
     //GetTextChain()->SetNilChainingEvent(mpTargetLink, false);