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

[matteocam]

 editeng/source/editeng/impedit3.cxx |    1 -
 include/svx/svdotext.hxx            |    4 ++--
 svx/source/svdraw/svdotext.cxx      |   11 ++++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 8aeead9b031b0d9415ea2fe740f9c626401b0d1f
Author: matteocam <matteo.campane...@gmail.com>
Date:   Wed Jun 17 15:39:58 2015 -0400

    Moved overflow check from ImpEditEng to SdrTextObj during editing mode
    
    Change-Id: I023d3960a3f6952bc9c21114bcd84d0be1a6ff42

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 13e6030..5d6ce0b 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4081,7 +4081,6 @@ void ImpEditEngine::CallChainingEventHdl()
     // only if it's the right ImpEditEngine (with right info on changes in 
text)
     if ( aChainingHdlLink.IsSet() /* && aStatus.GetStatusWord() */)
     {
-        CheckPageOverflow();
         aChainingHdlLink.Call( &mbNeedsChainingHandling );
 
     }
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index bbc9207..32321f4 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -549,7 +549,7 @@ public:
     /** called from the SdrObjEditView during text edit when the status of the 
edit outliner changes */
     virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus );
 
-    virtual void onOverflowStatusEvent( bool bIsPageOverflow );
+    virtual void onOverflowStatusEvent( );
 
 
 
@@ -621,7 +621,7 @@ public:
     OutlinerParaObject *impGetNonOverflowingParaObject(SdrOutliner *pOutliner) 
const;
 
     // Handler for Chained Text
-    DECL_LINK(ImpDecomposeChainedText,bool*);
+    DECL_LINK(ImpDecomposeChainedText,void*);
 
     // timing generators
     void impGetBlinkTextTiming(drawinglayer::animation::AnimationEntryList& 
rAnimList) const;
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index cc17892..e67f5e6 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1964,11 +1964,16 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* 
pEditStatus )
     }
 }
 
-void SdrTextObj::onOverflowStatusEvent( bool bIsPageOverflow )
+void SdrTextObj::onOverflowStatusEvent( )
 {
     if (!IsChainable())
         return;
 
+    if (!pEdtOutl)
+        return;
+
+    bool bIsPageOverflow = pEdtOutl->IsPageOverflow();
+
     if ( GetNextLinkInChain() != NULL ) // is there anything to transfer text 
to?
     {
         // set whether there is need for chaining
@@ -2090,9 +2095,9 @@ bool SdrTextObj::GetPreventChainable() const
     return pClone;
  }
 
-IMPL_LINK(SdrTextObj,ImpDecomposeChainedText,bool*,bIsPageOverflow)
+IMPL_LINK_NOARG(SdrTextObj,ImpDecomposeChainedText)
 {
-    onOverflowStatusEvent( *bIsPageOverflow );
+    onOverflowStatusEvent();
     return 0;
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits