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

[matteocam]

 0 files changed

New commits:
commit 628d7a3119a411b1cf720883a5bdc129021643ca
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Fri Jul 10 18:49:19 2015 -0400

    Revert "Attempt to block UF-s from propagating". It  does not help.
    
    This reverts commit 9d29ab065da5bb39069223fb30d67eeedb743608.

diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 5690225..6a70c8b 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -114,7 +114,6 @@ class ImpChainLinkProperties
 
     ImpChainLinkProperties() {
         INIT_CHAIN_PROP(NilChainingEvent, false)
-        INIT_CHAIN_PROP(JustHandledUnderflow, false)
         INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::NULL_EVENT)
         INIT_CHAIN_PROP(PreChainingSel, ESelection(0,0,0,0));
         INIT_CHAIN_PROP(PostChainingSel, ESelection(0,0,0,0));
@@ -123,7 +122,6 @@ class ImpChainLinkProperties
     private:
     // NOTE: Remember to set default value in contructor when adding field
     DECL_CHAIN_PROP(NilChainingEvent, bool)
-    DECL_CHAIN_PROP(JustHandledUnderflow, bool)
     DECL_CHAIN_PROP(CursorEvent, CursorChainingEvent)
     DECL_CHAIN_PROP(PreChainingSel, ESelection)
     DECL_CHAIN_PROP(PostChainingSel, ESelection)
@@ -147,7 +145,6 @@ class TextChain {
     // Specific Link Properties
     DECL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
     DECL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
-    DECL_CHAIN_PROP_INTERFACE(JustHandledUnderflow, bool)
     DECL_CHAIN_PROP_INTERFACE(PreChainingSel, ESelection)
     DECL_CHAIN_PROP_INTERFACE(PostChainingSel, ESelection)
 
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 49eab43..b627b77 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1425,11 +1425,6 @@ void SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL
 
 void SdrTextObj::impHandleChainingEventsDuringDecomposition(SdrOutliner &rOutliner) const
 {
-    if (GetTextChain()->GetJustHandledUnderflow(this)) {
-        GetTextChain()->SetJustHandledUnderflow(this, false);
-        return;
-    }
-
     GetTextChain()->SetNilChainingEvent(this, true);
 
     TextChainFlow aTxtChainFlow(const_cast<SdrTextObj*>(this));
@@ -1442,8 +1437,6 @@ void SdrTextObj::impHandleChainingEventsDuringDecomposition(SdrOutliner &rOutlin
         // underflow-induced overflow
         aTxtChainFlow.ExecuteUnderflow(&rOutliner);
         bIsOverflow = aTxtChainFlow.IsOverflow();
-
-        GetTextChain()->SetJustHandledUnderflow(this, true);
     } else {
         // standard overflow (no underlow before)
         bIsOverflow = aTxtChainFlow.IsOverflow();
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index f05d769..36966bb 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -26,7 +26,6 @@
 
 IMPL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
 IMPL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
-IMPL_CHAIN_PROP_INTERFACE(JustHandledUnderflow, bool)
 IMPL_CHAIN_PROP_INTERFACE(PreChainingSel, ESelection)
 IMPL_CHAIN_PROP_INTERFACE(PostChainingSel, ESelection)
 
commit 9d29ab065da5bb39069223fb30d67eeedb743608
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Fri Jul 10 18:48:15 2015 -0400

    Attempt to block UF-s from propagating
    
    Change-Id: Id843bd6e4e0ca7678ab3f9b3ccd8155a60bdfff5

diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 6a70c8b..5690225 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -114,6 +114,7 @@ class ImpChainLinkProperties
 
     ImpChainLinkProperties() {
         INIT_CHAIN_PROP(NilChainingEvent, false)
+        INIT_CHAIN_PROP(JustHandledUnderflow, false)
         INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::NULL_EVENT)
         INIT_CHAIN_PROP(PreChainingSel, ESelection(0,0,0,0));
         INIT_CHAIN_PROP(PostChainingSel, ESelection(0,0,0,0));
@@ -122,6 +123,7 @@ class ImpChainLinkProperties
     private:
     // NOTE: Remember to set default value in contructor when adding field
     DECL_CHAIN_PROP(NilChainingEvent, bool)
+    DECL_CHAIN_PROP(JustHandledUnderflow, bool)
     DECL_CHAIN_PROP(CursorEvent, CursorChainingEvent)
     DECL_CHAIN_PROP(PreChainingSel, ESelection)
     DECL_CHAIN_PROP(PostChainingSel, ESelection)
@@ -145,6 +147,7 @@ class TextChain {
     // Specific Link Properties
     DECL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
     DECL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
+    DECL_CHAIN_PROP_INTERFACE(JustHandledUnderflow, bool)
     DECL_CHAIN_PROP_INTERFACE(PreChainingSel, ESelection)
     DECL_CHAIN_PROP_INTERFACE(PostChainingSel, ESelection)
 
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index b627b77..49eab43 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1425,6 +1425,11 @@ void SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL
 
 void SdrTextObj::impHandleChainingEventsDuringDecomposition(SdrOutliner &rOutliner) const
 {
+    if (GetTextChain()->GetJustHandledUnderflow(this)) {
+        GetTextChain()->SetJustHandledUnderflow(this, false);
+        return;
+    }
+
     GetTextChain()->SetNilChainingEvent(this, true);
 
     TextChainFlow aTxtChainFlow(const_cast<SdrTextObj*>(this));
@@ -1437,6 +1442,8 @@ void SdrTextObj::impHandleChainingEventsDuringDecomposition(SdrOutliner &rOutlin
         // underflow-induced overflow
         aTxtChainFlow.ExecuteUnderflow(&rOutliner);
         bIsOverflow = aTxtChainFlow.IsOverflow();
+
+        GetTextChain()->SetJustHandledUnderflow(this, true);
     } else {
         // standard overflow (no underlow before)
         bIsOverflow = aTxtChainFlow.IsOverflow();
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 36966bb..f05d769 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -26,6 +26,7 @@
 
 IMPL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
 IMPL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
+IMPL_CHAIN_PROP_INTERFACE(JustHandledUnderflow, bool)
 IMPL_CHAIN_PROP_INTERFACE(PreChainingSel, ESelection)
 IMPL_CHAIN_PROP_INTERFACE(PostChainingSel, ESelection)