svx/source/svdraw/svdotext.cxx | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-)
New commits: commit c835e327d9941cf65d82fbdf66c368a4e66016b4 Author: matteocam <matteo.campane...@gmail.com> Date: Wed Jul 29 17:38:09 2015 +0200 Remove old code Change-Id: Ie226e450d3013c92e9a0236a1c3cfd214b6edab5 diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 66b8a7a..ca28046 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1989,35 +1989,13 @@ bool SdrTextObj::IsChainable() const // Read it as item const SfxItemSet& rSet = GetObjectItemSet(); OUString aNextName = static_cast<const SfxStringItem&>(rSet.Get(SDRATTR_TEXT_CHAINNEXTNAME)).GetValue(); - return aNextName != ""; - - // XXX - if (!GetName().startsWith("Chainable")) { - //fprintf(stderr, "[CHAINABLE?] %p is _not_ chainable\n", this); - return false; - } + return aNextName != ""; // XXX: Should we also check for GetNilChainingEvent? (see old code below) +/* // 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 ) ); - - if (!bHasDoneTheLinking && pPage && pPage->GetObjCount() > 1 && this == pTxtObj0) - { - SdrTextObj *pTxtObj1 = dynamic_cast< SdrTextObj * >( pPage->GetObj( 1 ) ); - const_cast<SdrTextObj *>(this)->SetNextLinkInChain(pTxtObj1); - - bHasDoneTheLinking = true; - } - // end hack - - - return true; - +*/ } void SdrTextObj::onChainingEvent() _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits