sw/source/core/txtnode/thints.cxx | 40 +++++++++++++++++++++++++++++++++-----
1 file changed, 35 insertions(+), 5 deletions(-)
New commits:
commit 7ea3a2b5747f148cbdc9a065728cefff1a660bd7
Author: Philippe Jung <phil.j...@free.fr>
Date: Tue Jun 2 17:43:19 2015 +0200
tdf#91228 Fix Writer crash
Start Writer, Insert Image, Anchor as character, Go after
image, press enter, writer crash
This is because m_pAnchoredFly is not updated.
JoinPrev, JoinNext and SplitContentNode all rely on CutText with calls
InsertHint. InsertHint calls SetAnchor. SetAnchor calls Modify callback
except if "LockModify"ed. This patch ensures that, whatever the value of
LockModify, the references are kept correct.
Reviewed-on: https://gerrit.libreoffice.org/16041
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 9f01951b858453684f2622541af0eb85d4544fc6)
Signed-off-by: Michael Stahl <mst...@redhat.com>
Conflicts:
sw/source/core/txtnode/thints.cxx
Change-Id: Id7254784c6954db4b542b2c4228b388fb924bbc2
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index a03b391a7..37b0c26 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1277,19 +1277,44 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr,
const SetAttrMode nMode )
{
SwTxtFlyCnt *pFly = (SwTxtFlyCnt *)pAttr;
SwFrmFmt* pFmt = pAttr->GetFlyCnt().GetFrmFmt();
+
+ // In order to maintain data coherency, if the hint is a fly
+ // moved from a text node to another, we have to remove it from
+ // the first textnode then to add it to the new (this) textnode
+ const SwFmtAnchor* pAnchor = 0;
+ pFmt->GetItemState( RES_ANCHOR, false,
+ reinterpret_cast<const SfxPoolItem**>(&pAnchor) );
+
+ SwIndex aIdx( this, pAttr->GetStart() );
+
+ bool bChangeFlyParentNode( false );
+ if (pAnchor &&
+ pAnchor->GetAnchorId() == FLY_AS_CHAR &&
+ pAnchor->GetCntntAnchor() &&
+ pAnchor->GetCntntAnchor()->nNode != *this)
+ {
+
assert(pAnchor->GetCntntAnchor()->nNode.GetNode().IsTxtNode());
+ SwTxtNode* textNode =
pAnchor->GetCntntAnchor()->nNode.GetNode().GetTxtNode();
+
+ if ( textNode->IsModifyLocked() )
+ {
+ // Fly parent has changed but the FlyFormat is
locked, so it will
+ // not be updated by SetAnchor (that calls Modify
that updates
+ // relationships)
+ textNode->RemoveAnchoredFly( pFmt );
+ bChangeFlyParentNode = true;
+ }
+ }
+
if( !(nsSetAttrMode::SETATTR_NOTXTATRCHR & nInsMode) )
{
+
// Wir muessen zuerst einfuegen, da in SetAnchor()
// dem FlyFrm GetStart() uebermittelt wird.
//JP 11.05.98: falls das Anker-Attribut schon richtig
// gesetzt ist, dann korrigiere dieses nach dem Einfuegen
// des Zeichens. Sonst muesste das immer ausserhalb
// erfolgen (Fehleranfaellig !)
- const SwFmtAnchor* pAnchor = 0;
- pFmt->GetItemState( RES_ANCHOR, false,
- (const SfxPoolItem**)&pAnchor );
-
- SwIndex aIdx( this, pAttr->GetStart() );
const OUString c(GetCharOfTxtAttr(*pAttr));
OUString const ins( InsertText(c, aIdx, nInsertFlags) );
if (ins.isEmpty())
@@ -1353,6 +1378,11 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr,
const SetAttrMode nMode )
return false;
}
}
+
+ // Finish relationships update now that SetAnchor has fixed
part of it.
+ if (bChangeFlyParentNode)
+ AddAnchoredFly( pFmt );
+
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
