svx/source/svdraw/svdotext.cxx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
New commits: commit b15d415316b012886ae2d0aff44f9f667263d498 Author: matteocam <matteo.campane...@gmail.com> Date: Mon Jul 27 14:07:58 2015 +0200 Make linking only for chainable boxes Change-Id: Ia8ed6ae90abba5a0c3092c5a1d781443ea611fc9 diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index d9b16b8..1aa6e73 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1986,7 +1986,17 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) bool SdrTextObj::IsChainable() const { - // XXX: Hack to have links together + // XXX + if (!GetName().startsWith("Chainable")) { + //fprintf(stderr, "[CHAINABLE?] %p is _not_ chainable\n", this); + return false; + } + + // Check that no overflow is going on + if (!GetTextChain() || GetTextChain()->GetNilChainingEvent(this)) + return false; + + // XXX: Hack to have links together static bool bHasDoneTheLinking = false; SdrTextObj *pTxtObj0 = dynamic_cast< SdrTextObj * >( pPage->GetObj( 0 ) ); @@ -1998,19 +2008,9 @@ bool SdrTextObj::IsChainable() const bHasDoneTheLinking = true; } + // end hack - - // XXX - if (!GetName().startsWith("Chainable")) { - //fprintf(stderr, "[CHAINABLE?] %p is _not_ chainable\n", this); - return false; - } - - // Check that no overflow is going on - if (!GetTextChain() || GetTextChain()->GetNilChainingEvent(this)) - return false; - return true; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits